tree 3c98786a09472d6502f159f06a4b4c1e65f9de57
parent 5aebb037a3a11f000376ea91b93d40984dd5a364
parent a552fc21c7b288d73c46e04db48357e90f39fea7
author Eugene Susla <eugenesusla@google.com> 1604612704 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604612704 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 9ec3bf497e am: ee729e7a92 -s ours am: a552fc21c7

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

Change-Id: Ie87daa277dfabe4fd63f4fa0f9e6c7d1325761f5