tree 0288a11e9abdd71e5e4b41aea756e03da5f0c1d2
parent 7ac0efb04b5a6a6df06ee15b4287f724fe7557b2
parent 54e9da6940c87f26c70501b38efa6327d53a478c
author Jonathan Scott <scottjonathan@google.com> 1558533273 -0700
committer android-build-merger <android-build-merger@google.com> 1558533273 -0700

[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

Change-Id: If4ca96f9f00a2fd4cc2d9bf9c12c3f45f8efad94