OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:11:29 +0000 (17:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:11:29 +0000 (17:11 +0000)
am: 45cd2f896b

Change-Id: If0d77fc4311666cff881c371167fd19a534d0fb2


Trivial merge