tree 83cce152cc3792f6d995121b6ca200492d7732ac
parent c2a8913cf0053442c76b85f7abf47bed0474d000
parent 2688770c06aa6d6141bfe76bfaf79f9d1fc5356a
author TreeHugger Robot <treehugger-gerrit@google.com> 1591184107 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591184107 +0000

Merge "RESTRICT AUTOMERGE" into oc-dev am: 2688770c06

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11375232

Change-Id: I3b54fb6905a9286037db54654e372af6929d9f41