commit | f5ab0b35e125c77cb930adfa70fd2db1f2bf74be | [log] [tgz] |
---|---|---|
author | Jakub Pawlowski <jpawlowski@google.com> | Mon Sep 13 21:53:56 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 13 21:53:56 2021 +0000 |
tree | f0d4739eaf7cb7ba8b63ed8809657b5ae7fd02b6 | |
parent | 575c989cb8f84f575195ecd9a78849c4a2e7b961 [diff] | |
parent | b20554d86e8f2d0b186847f4fb05353c2b79dfa2 [diff] |
[automerger skipped] Merge "csip: Add Coordinated Set Identification Profile" am: baea19f18f -s ours am: 711025a464 -s ours am: c7663a5148 -s ours am: 4e2f5320ab -s ours am: b20554d86e -s ours am skip reason: Merged-In I67536ddcc32ace82d63e19426dce19f2bc69cdea with SHA-1 d35f8bcddc is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1749722 Change-Id: I766c1f1d260fc848c54049a773600cd5d7167bd4