commit | 1232e284fb1b90d31352ee81109d5bd9e89a03b9 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed May 22 13:55:18 2019 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 22 13:55:18 2019 +0000 |
tree | fd121279c96a99fe950f425e3b4e1c908f667517 | |
parent | 624bd12bd12be88084a7c2d4e9493dc11db187c3 [diff] | |
parent | 37fb82c785932082ff0759bcba16293511a6acf8 [diff] |
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc)." into oc-dev am: 4c9fa739ff am: 66785eeba5 -s ours am: 97d3ab297a -s ours am: eaafe5e711 -s ours am: 2288a74328 -s ours am: 54e9da6940 -s ours am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history" into qt-r1-dev-plus-aosp