OSDN Git Service

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make Lock task default consistent...
authorJonathan Scott <scottjonathan@google.com>
Wed, 22 May 2019 00:28:01 +0000 (17:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 May 2019 00:28:01 +0000 (17:28 -0700)
am: 66785eeba5 -s ours
am skip reason: change_id I40c9a29935d9e5a27cdcdf90187efe61035448fd with SHA1 cd6c636800 is in history

Change-Id: Ieb5f34b6aba4d9369be013a399652eac2f8210e0


Trivial merge