| commit | 0c0a4560ddde7f8749207e8beeb58e0fcd085bfe | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Sep 20 13:58:01 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 20 13:58:01 2021 +0000 |
| tree | 335e3185693ef635da041fd668e53d30956e32e2 | |
| parent | e64f4fa853af56fa334e282fa6ed1cbc9c1bd3b8 [diff] | |
| parent | 2afc49de3a4cce70a648d99b6ec6fddc96ba1d4b [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 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: If09efc7e1287b7442d363e487cba30c05ec89c79