OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)
am: 83cf293b73  -s ours

Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0


Trivial merge