OSDN Git Service

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

Change-Id: I87bb8284037b01da2de982a3602339741ed6f4f8


Trivial merge