tree 959f5c2f87c4d25cd27a1cdb2c79c9f433bdbd3b
parent a09726606f4bb9021fcf6381a1887c4c7371f7a2
parent 99ec6d7c6b5ac88aac391d9f3d29800e51624d9e
author Xin Li <delphij@google.com> 1637208716 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637208716 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 9fb33388af -s ours am: dc51f278a1 -s ours am: 99ec6d7c6b -s ours

am skip reason: Merged-In I637b82fd2c57ac45b5c28b74941cf1c80235e844 with SHA-1 ba5e8ed70b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/16274657

Change-Id: I4ca01ece7bc0bd476cacbb8eb4ac3f5607a1749f