OSDN Git Service

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

Change-Id: Ib395d9fee37f51fd735dca8ba67fd37ab3f7606b


Trivial merge