OSDN Git Service

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

Change-Id: I3265aee42b89b18cdc3be5d374e25897f15be208


Trivial merge