OSDN Git Service

DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
authorPawin Vongmasa <pawin@google.com>
Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)
am: 453ba68c65

Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4


Trivial merge