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:fe9f143d2cam:4938d3e518am:498d367b2cam:d6f4a3f2bcskipped:ad38008f58[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:fe9f143d2cam:4938d3e518am:498d367b2cam:d6f4a3f2bc[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:fe9f143d2cam:4938d3e518am:498d367b2c[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:fe9f143d2cam:4938d3e518[automerger] [RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings. am:fe9f143d2c[RESTRICT AUTOMERGE] Make Lock task default behaviour consistent with Settings.
This commit is contained in:
committed by
Android (Google) Code Review
commit
42fb96810e