OSDN Git Service

Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
authorSungsoo Lim <sungsoo@google.com>
Sat, 30 Jul 2016 04:44:18 +0000 (04:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Jul 2016 04:44:18 +0000 (04:44 +0000)
am: 124cc534f8  -s ours

Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa


Trivial merge