OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:10:39 +0000 (17:10 +0000)
am: a25f2f5359

Change-Id: I41c1d70146910fc39926c7fcd1951863f8e967e1


Trivial merge