tree dd29eb4f911ba980cb68368ca01e04afc5ffb8e3
parent 34ddad6f0a68b1966a2c5641a6fe67053556ccbb
parent b539388631aebf8857814fbc1e9018fdc2e5c23a
author TreeHugger Robot <treehugger-gerrit@google.com> 1591184092 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591184092 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE" into oc-mr1-dev am: b539388631 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49abb29e02d9cc3da691dd44d8ea040100893005