Merge "Fix AeModeAndLock test cases. Bug: 36103813" into oc-dev

am: 3671e9249b

Change-Id: I0a9c3a30877d1aa54cc45a67abcd4444eebf63c4
This commit is contained in:
Yuchen He
2017-06-08 06:01:50 +00:00
committed by android-build-merger

Diff Content Not Available