tree ee1f3223ac5d5fee3212be434af600fb030437c4
parent bd3635bd35bae1e881ff461b2919a21e45cced19
parent 83fac841f899d655069d6c81ed1361fa141527a1
author Patrick Baumann <patb@google.com> 1598573300 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598573300 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 681b236422 -s ours am: 5daea910bb am: 83fac841f8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3d5317bf0c37e855829aa8bf4e4ce6ec327e76b9