tree a8880f323ce649e77c9d2569a42b3aacb4d65ef4
parent 0dc23f95a1bd7262909d2534c2d77ea0e73d5957
parent 93f8bfa5c4422afa8f8126610ea73a24b4fad36b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1521041026 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1521041026 +0000

[automerger] DO NOT MERGE Fix build with SDK 24-like implementation of constructor am: f3c2e0b3ab am: 1b6f3f9a97 am: d0fcb49352 skipped: 93f8bfa5c4

Change-Id: Ie516029e98d07f4ebb6916d75af625c92e711fde