OSDN Git Service

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

Change-Id: I46dd8facbac82da0651a5fb9e8c5c22e168d29c6


Trivial merge