summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothMasInstance.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-10-13 04:50:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-13 04:50:33 +0000
commitfd0264438326c6570e689274b056e5d25987c78d (patch)
treeaa9ae52e0f806a917931a9403baad0c35fcc3f6d /framework/java/android/bluetooth/BluetoothMasInstance.java
parent5ab87b53caf3999e52d08fd1d612519da33d2bd0 (diff)
parent132375e71f4f9695a79d5b8419994659dcf7de54 (diff)
[automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours am: 4b4ea5481c -s ours am: 132375e71f -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991 Change-Id: I93ca7693005bd26b157fc31c10170e4d2dff5934
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothMasInstance.java')
0 files changed, 0 insertions, 0 deletions