Merge \\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\" into nyc-mr1...
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:45:07 +0000 (20:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:45:07 +0000 (20:45 +0000)
commita1983395170e668f92f5696d7c0d7942bf7a16de
tree1902408cd5b6cb49b1f00fc5050ae7468d74913a
parent6829dca52757c4dc55098e2e67ee82ed528471db
parent2dc4d39d70624169263a20221d54b5cbd6bd04b7
Merge \\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\" into nyc-mr1-dev-plus-aosp am: 114f46a0dc
am: 2dc4d39d70

Change-Id: Iec54c2ef5a58363948dfe6d0d5ab32944e7c889e