diff options
author | Xin Li <delphij@google.com> | 2022-03-08 11:03:52 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 11:03:52 +0000 |
commit | bdb75e7201725a6e356160865fb1e61e595185c5 (patch) | |
tree | a82ebf11200fa48b0a54a06180fb8610a62a7a0c | |
parent | c0a194a15c915d4efab676a19c3f02c1ee235d46 (diff) | |
parent | cdb8acd8cc3ad717546b5cd22cef2c4feff1f8ea (diff) | |
download | chips-bdb75e7201725a6e356160865fb1e61e595185c5.tar.gz |
[automerger skipped] Merge Android 12L am: b294f2ba36 -s ours am: cdb8acd8cc -s ours
am skip reason: Merged-In Ibdbea20a6d5c4a8a36b5317abea3e68dd397e9db with SHA-1 6a7d7752e1 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/2013319
Change-Id: I0767ec68085597e67d730ef1a6decfb92d8d6370
0 files changed, 0 insertions, 0 deletions