42fb96810e995566001bd0295a1815b3fa345898 - platform/frameworks/base

commit	42fb96810e995566001bd0295a1815b3fa345898	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Wed May 08 23:21:42 2019 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Wed May 08 23:21:42 2019 +0000
tree	f0e1b71b64ec5bda832586293d9c22c1686eb3c3
parent	123ffb620219df07cd624d058240e8d888c37207 [diff]
parent	970863ea621ab8dc9aa3463d6b9e9c89ce8cfb03 [diff]

Merge changes from topic "am-f8d9284a-cfc8-4e4b-8915-eaac6542f6b5" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc skipped: ad38008f58
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c am: d6f4a3f2bc
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518 am: 498d367b2c
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c am: 4938d3e518
  [automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am: fe9f143d2c
  [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.

tree: f0e1b71b64ec5bda832586293d9c22c1686eb3c3