| commit | 4a28948fbc8996ecd8dede64aaa044fafb5bc069 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Tue May 21 18:53:10 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 21 18:53:10 2019 +0000 |
| tree | 3635298f805c8855254e23658372149270134018 | |
| parent | 99816c8226529aaccf7150b20be81fe783114817 [diff] | |
| parent | d481577b64cd1bf709f297af34d1ed6e00cc874a [diff] |
Merge "[automerger skipped] [RESTRICT AUTOMERGE] Make Lock task default consistent w/ Settings (oc-mr1-dev). am: cd6c636800 -s ours am: 84778db6b6 -s ours am: ffc54fc8b9 am: 1eeffeb98c" into qt-r1-dev-plus-aosp