tree 971c171078336e8bb4d0d52b464601bec01058b0
parent d4cb0b8ad980c38be53fc0a586150ccf3803d3df
parent 5c73d2ce3116d07acb15b5f75f136288899b999e
author Xin Li <delphij@google.com> 1607572732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572732 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 223d9273bb -s ours am: ab5332ac88 -s ours am: 5c73d2ce31 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/development/+/1520839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94d13554a8bd2cbaf7e832a1db398855f03ee9e0