OSDN Git Service

DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5...
authorfionaxu <fionaxu@google.com>
Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Jun 2016 18:41:33 +0000 (18:41 +0000)
am: e892848035

Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed


Trivial merge