OSDN Git Service

DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours
authorSungsoo Lim <sungsoo@google.com>
Sat, 30 Jul 2016 05:40:52 +0000 (05:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Jul 2016 05:40:52 +0000 (05:40 +0000)
am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636


Trivial merge