DO NOT MERGE: Fix CTS regression am: edc9238514 -s ours

am: 0fb1075d95

Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
This commit is contained in:
Sungsoo Lim
2016-07-30 05:40:52 +00:00
committed by android-build-merger

Diff Content Not Available