[automerger skipped] Merge "Backport of ag/14170751 and ag/14170752." into rvc-qpr-dev am: 3208605ab6 -s ours am: e1645d0c0c -s ours am: d9952e3d4f -s ours

Browse Source

am skip reason: Merged-In I3c2b718905d2d7619d6f299ee5402fd858de030e with SHA-1 80005cd697 is already in history

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

Change-Id: Ie685caeb0635368d4c036661933233ab0173b67c

...

This commit is contained in:

JW Wang

2021-05-19 22:48:50 +00:00

committed by Automerger Merge Worker

parent 16288d35f2 d9952e3d4f

commit c4f23a7b41

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available