commit | 5c3a054b60f1eb5303f865582614b7a10ff8e758 | [log] [tgz] |
---|---|---|
author | wwx234259 <yuanshuo1@huawei.com> | Fri Aug 03 00:41:55 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Aug 03 00:41:55 2018 -0700 |
tree | 7c1d4757e97ab0a64bb163e8db5431753ebf4c08 | |
parent | 857e9e197085318bbea2f563c4036229c2c99cdf [diff] | |
parent | 9a804df9eef46c445e86fa596b425b9c4afd800a [diff] |
Merge "[automerger skipped] Merge "DO NOT MERGE: Make the tests permissive for OMR1 Fix a timing bug, make sure to wait for the assistant to enable" into oreo-mr1-cts-dev am: 6571bb5854 -s ours" am: 9a804df9ee -s ours Change-Id: I630a6c679fb815569c2612386ad5bbd0c7031389