OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 18:01:11 +0000 (18:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 18:01:11 +0000 (18:01 +0000)
am: 2c4162e822

Change-Id: I3baeab891856725b93c22c11ea0a0b6f4bc8ddbb


Trivial merge