OSDN Git Service

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

Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff


Trivial merge