OSDN Git Service

DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171
authorSungsoo Lim <sungsoo@google.com>
Fri, 29 Jul 2016 18:45:45 +0000 (18:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Jul 2016 18:45:45 +0000 (18:45 +0000)
am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368


Trivial merge