commit | 0cf34dc62cd20379630a44823310cda54b8f1085 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Sep 20 13:38:52 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 20 13:38:52 2021 +0000 |
tree | 49b5b21666d842ee8d2b7241d1f1f3d53c64f08e | |
parent | 55318ff7ec6c8b558c7b92a9b3bca96c7a09003a [diff] | |
parent | 054817d68c0fd3d7be6f7b541bff02f5f4bf6113 [diff] |
[automerger skipped] Merge "csip: Expose an extra data with intent and store in CachedBluetoothDevice" am: 09170fdb8a -s ours am: 054817d68c -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: I6ceaa441bab62add0b98a3d6db7a27b46b090434