OSDN Git Service

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

Change-Id: I2e6b505b24592dbcbc23e4d8c4025ad9972b73ad


Trivial merge