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)
commit7e2c6c3440d157e250be1aeefb665f236b55bdcd
treedf95775c0acb900659ae557d11986d8acbde4802
parentafed6f86319aa92d6ccd3dbf09f4ce7344b1f220
parente8928480358e31f50e893ca4a141a2b8f14a8af1
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5  -s ours am: e1ca4cd074  -s ours am: 0e64d7411e am: eb53629bf7 am: 16dfcd7950  -s ours am: 2d03c0f956 am: dc9a7c7b23
am: e892848035

Change-Id: Ic74c9116d505f3f76dd659d7bfd60ded6463f0ed