| commit | 91a615139cff2b51840b4b47bc127087777e1821 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed May 22 02:08:02 2019 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 22 02:08:02 2019 +0000 |
| tree | 10926b4b3c8c4ec1f091af2e036fb58b7cdc692e | |
| parent | 18dedbdbe2fca949f55e6ff0e418a0157f345999 [diff] | |
| parent | 7ac759cc1f9fd67ae945736b7869c38b04ac5ea9 [diff] |
Merge "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 am: 4a28948fbc -s ours am skip reason: subject contains skip directive"