tree 74fe1f0278474e829080f9b88aa686b2e1f82499
parent e7a38c81fdd96d55c182174968c816ea39932907
parent be115041b28df1abddc2de94b645947eedc54b18
author Eugene Susla <eugenesusla@google.com> 1604612692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604612692 +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: I8bc5cbbfa883857c608a9f8fde4a6c28b511b90e