summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothCodecConfig.java
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2020-09-14 21:18:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-14 21:18:54 +0000
commitb5ee4848c22cf25ddaa64acbdbbcc3d907e01749 (patch)
treee289f0b7bca99a58008497b5e09b76bb7fa1ca0e /framework/java/android/bluetooth/BluetoothCodecConfig.java
parent5e0b0142839286e2b2330f02c22a64addd3f3615 (diff)
parentc9feca3c407cf04803490df7a89313a20ddb864e (diff)
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741 Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothCodecConfig.java')
0 files changed, 0 insertions, 0 deletions