Merge \"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\" into nyc-mr1...
authorJulien Desprez <jdesprez@google.com>
Mon, 27 Jun 2016 19:15:58 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 27 Jun 2016 19:15:58 +0000 (19:15 +0000)
commit2dc4d39d70624169263a20221d54b5cbd6bd04b7
tree1902408cd5b6cb49b1f00fc5050ae7468d74913a
parent244b38f4347993e1d9771e7d17d2ecebc53e9550
parent114f46a0dcfaaeac109b229dd239850abcd6fa7e
Merge \"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\" into nyc-mr1-dev-plus-aosp
am: 114f46a0dc

Change-Id: Ib1be550cafb93990b67853bc548045461a2de310