| commit | f5b653b54b8ece8f841e05637a9c4f0fb0fae715 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Sep 20 14:15:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 20 14:15:36 2021 +0000 |
| tree | c57f2b6e1d6f8cf14a4dfe0b6114273642b9432f | |
| parent | 524f1d203f88c6255fc2c0a8cae2a7299c2d7731 [diff] | |
| parent | 0c0a4560ddde7f8749207e8beeb58e0fcd085bfe [diff] |
[automerger skipped] Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" am: 09170fdb8a -s ours am: 054817d68c -s ours am: 0cf34dc62c -s ours am: 2afc49de3a -s ours am: 0c0a4560dd -s ours am skip reason: Merged-In I3e99c59e0cb974409291e1b4c28393106784e133 with SHA-1 e12ff23a6d is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1820432 Change-Id: If7261e48a744ed73f4e19c489e202464c7cbdfa8