| commit | 13eb02f2ba59a49249dc8670dac3d85820894e8c | [log] [tgz] |
|---|---|---|
| author | Alice Kuo <aliceypkuo@google.com> | Thu Dec 30 02:01:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 30 02:01:48 2021 +0000 |
| tree | 0959575fc67cfb6d2a6cde3e35fc8673335b531c | |
| parent | 5be90ac61897303f1a2aa3eacb166dfba3d08c89 [diff] | |
| parent | 02d8bafba246b547b4d1677f3194624b2986d732 [diff] |
[automerger skipped] Merge "Group CSIP device based on CAP" am: 8c0ae12d46 am: 88a9f98e2b am: 190d67ddef am: 02d8bafba2 -s ours am skip reason: Merged-In Ia3d0dbe496dec822fee8ae6465b81688b9e9440c with SHA-1 436bffbdf0 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934946 Change-Id: I4fbc96ab0707a6e90a3190d9d70f464dec9692d3