tree 0654f5b9fdcb684df9d17c0ba6ece739517d0c96
parent 748281691345c7e227f23b5a7e5f78089849a4c5
parent 69a5e083ef719516c1a337c478588b1b739167c9
author Xin Li <delphij@google.com> 1599080213 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599080213 +0000

[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 0cfc7f9932 -s ours am: 1e40a5d256 -s ours am: 69a5e083ef -s ours

am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

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

Change-Id: I33e54d0cd8b83b842effa774170a43b2439ed76b