tree 0f94a1e1dd02959c60044c1678e28642b4d18b8c
parent 6029bce3b484c7fffa62356346e7d00f898f1fdb
parent 526239e8006e405a88c6be3d5aebb843f3dd0bed
author Yuchen He <yuchenhe@google.com> 1496896351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496896356 +0000

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