tree 3fedee788c78f75345259b7368fc659648e43242
parent 9b821f215acff3a96dd961012ee4f7bd05b54da3
parent 948d9f4dc2cb3d6dd995467fd8f0d044ac681edd
author Xin Li <delphij@google.com> 1624255821 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624255821 +0000

[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 948d9f4dc2 -s ours

am skip reason: Merged-In I9ed0d234498f34217ed39bcad95e987921ee872f with SHA-1 9b821f215a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/chips/+/1741412

Change-Id: If3b60d8619912dd4b9d6fc673d8d17b0c17c850f