OSDN Git Service

Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)
am: 7a66bd2404

Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80


Trivial merge