tree ed98bbcfe6d587e79843f3fd0f8e27ada370b0ea
parent bbf8425a8ced92699d444496bc1cfd8f68e3bff3
parent d497f69015c6fe0914304fa1e3e74e524b73ade3
author Xin Li <delphij@google.com> 1607569517 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607569517 +0000

[automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: d497f69015 -s ours

am skip reason: Change-Id If519752201f61bb36d8a96620d07327b3f6f8f02 with SHA-1 bbf8425a8c is in history

Original change: https://android-review.googlesource.com/c/device/google/bramble/+/1520840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa219755aa31e9daa0638335f562103f33dbd845