tree 329ac8a66586481ecbc5fea5855e48f751420db1
parent d357342a4a761598742f4b1b60f70a4e9b88f997
parent 25d38a56aed6cd8b61f057ca90d5c776a68dbf19
author Alan Viverette <alanv@google.com> 1521050991 +0000
committer android-build-merger <android-build-merger@google.com> 1521050991 +0000

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4 am: e32e8229b3 am: f98157e2ba am: 4f83bad908 am: a982645d5c skipped: 9d3e228729 am: 8a095b5f19 am: 0886b1a751
am: 25d38a56ae  -s ours

Change-Id: I0bf700a857b7eba5aebf66e0c2f7970234d7ac00