Merge \\\\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\\\" into nyc...
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:50:30 +0000 (20:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:50:30 +0000 (20:50 +0000)
commit59e8008a6ed0854d20518e3aea51dd4e7c1ec164
tree323977010fc891f8ff6137e29543466ca7c674f2
parent765ee043e4547bd46115d69a79487855814e90df
parent49723e91729fc7f9780ef81320004eae6141cb27
Merge \\\\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\\\" into nyc-mr1-dev-plus-aosp am: 114f46a0dc am: 2dc4d39d70 am: a198339517
am: 49723e9172

Change-Id: I8e0281fc4a0c38439612eba07a9149f5a182a73a