Merge \\\"Fix build with new Interface am: af51a2acde am: 3b9fe61b5e\\\" into nyc...
authorJulien Desprez <jdesprez@google.com>
Mon, 25 Jul 2016 20:48:01 +0000 (20:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 20:48:01 +0000 (20:48 +0000)
am: a198339517

Change-Id: Ia3b663687e56eb2520fabaa73fe6f90a965f0d47


Trivial merge