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

am: 43f1ee3ac8

Change-Id: Ic0fb208b3b556269c24c8a6e8a557edf8bd917d4
This commit is contained in:
Yuchen He
2017-06-08 06:12:35 +00:00
committed by android-build-merger

Diff Content Not Available