tree 40950f90952bf476ceda6e2f808b4ce2663680d9
parent 2456ebbb04ca814bc1e29cdca840ab6b76566134
parent f676899bc8e7e101235183ca9889ed5b5c9edd57
author Bill Yi <byi@google.com> 1604517865 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604517865 +0000

[automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 7ff2eff0fa -s ours am: 69b8dea355 -s ours am: f676899bc8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I51e0f5d93cd564b17ba5c195021e6ff9034c0c8d