tree 601527d13ed15d50c15b4cf01071805ae82e41c1
parent 71a7e46d2a0c8a56c916fcf5915a7f0907f1766e
parent 11c4f67eea55b9f7372e9bd4cce65499c4bb0483
author Eugene Susla <eugenesusla@google.com> 1604614716 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604614716 +0000

[automerger skipped] RESTRICT AUTOMERGE am: e8551a88f6 am: 6b6c135380 am: 2c54e6259a -s ours am: bcea247e03 -s ours am: 11c4f67eea

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

Change-Id: I7ac85c1a6a9dffbbfd0063d0c86a5bd826f15a5b