OSDN Git Service

Merge \\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\" into lmp-dev am: 124cc534f...
authorSungsoo Lim <sungsoo@google.com>
Sat, 30 Jul 2016 08:23:30 +0000 (08:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 30 Jul 2016 08:23:30 +0000 (08:23 +0000)
commit3a9923d7cf4ea8788eae0f284591074197786717
tree9122491fefad7b4b041eecd20be070c701fa5afe
parentce272c6b6b744c2b36a4c18c629006931205763d
parentea7fa85a0d8c458b290e9814f4be6253faf7ce3b
Merge \\\\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\\\" into lmp-dev am: 124cc534f8  -s ours am: 3d58e326d9 am: 8ef8e2b648 am: ec986ac944  -s ours am: cc154342aa am: ee0c3b013a am: 0d05028ba8 am: 2f7756f4c9  -s ours
am: ea7fa85a0d

Change-Id: Idd36b801a596e2f1d1f471038f7829191a5aa747