tree 66b89d1a303ec83a6aa4b412b01c5b4c2f524b16
parent 5ef3aaeb19004bbeb692e778d43499184b0cd6a5
parent 9497dac7ea3d1fd074125ae12cfc78b8cd64b6c9
author Eugene Susla <eugenesusla@google.com> 1612917022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1612917022 +0000

[automerger skipped] RESTRICT AUTOMERGE am: 30e9d28c22 am: 4d587c5aa9 -s ours am: 3c24d07dfb am: 9497dac7ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8216b599580486cccbad63563d6ff336fc88e15