diff options
author | Bill Yi <byi@google.com> | 2020-09-14 21:50:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-14 21:50:56 +0000 |
commit | c6c03b47eeaa2ac25e066a1d6dc9f0522534ea45 (patch) | |
tree | e289f0b7bca99a58008497b5e09b76bb7fa1ca0e /framework/java/android/bluetooth/BluetoothCodecConfig.java | |
parent | 1542c6d685f87c500a5645f4e5ac2d33bdee3305 (diff) | |
parent | b5ee4848c22cf25ddaa64acbdbbcc3d907e01749 (diff) |
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 938d3bb1f5 -s ours am: b5ee4848c2 -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: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothCodecConfig.java')
0 files changed, 0 insertions, 0 deletions