OSDN Git Service

DO NOT MERGE: Fix CTS regression am: 90be39c7bb am: db9f504522
authorSungsoo Lim <sungsoo@google.com>
Fri, 29 Jul 2016 19:02:43 +0000 (19:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 19:02:43 +0000 (19:02 +0000)
am: b04c428935

Change-Id: I5781e7822d050426288bbd42faafff31f098aa99


Trivial merge