tree 3c98786a09472d6502f159f06a4b4c1e65f9de57
parent 66c6409aa7561961a99e9c879e6e4503fe53bca2
parent be115041b28df1abddc2de94b645947eedc54b18
author Eugene Susla <eugenesusla@google.com> 1604612714 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604612714 +0000

[automerger skipped] RESTRICT AUTOMERGE am: feb4dd913c -s ours am: ef72a9b8c4 am: 7a85d4deb2 -s ours am: be115041b2

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

Change-Id: I86498494efb672f4227174dc18ca5fede5d01b80