tree 46e03f709bdf9a95f45452ee9ef64f59b2c61125
parent 1d51eb9c03f9fc9d1d07aa8b2fdf179c8d3a0bc8
parent 811352be16f551b5f8e8cbb541c7faf04b3d5a1a
author Eugene Susla <eugenesusla@google.com> 1604613537 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604613537 +0000

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

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

Change-Id: Ibb1cae84a20becd91b088eeab52b3f1bae1c1f99