tree 767f6ed6e6d8c18f18ccb97f3341123b001f3ec8
parent f5202d61c557a326fe265c26ff752bf08a9a4837
parent 032769f408dcbbfd1b1b794a38f1a3adf08f7950
author Xin Li <delphij@google.com> 1614814628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614814628 +0000

[automerger skipped] Merge RQ2A.210305.007 am: 36a18716db -s ours am: 032769f408 -s ours

am skip reason: Change-Id Ie5b6e5a83380a10bcd98812d232d378593f8b458 with SHA-1 dfbae81268 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38de8936b95055aba9c971d13692b38f80c27111