DO NOT MERGE: Fix CTS regression am: df17644db7 am: 057b548171

am: f645010092  -s ours

Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
This commit is contained in:
Sungsoo Lim
2016-07-29 18:45:45 +00:00
committed by android-build-merger

Diff Content Not Available