tree 04d949af0dcf190052578d85f586fafc9126a020
parent 2a1c2a7aba7090223cc70b9264cba57ff90c254e
parent 2766aa919e4183637f8b1f14d871d6a01ce8c4c3
author TreeHugger Robot <treehugger-gerrit@google.com> 1607379531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607379531 +0000

[automerger skipped] Merge "Move all BluetoothCodecConfig and BluetoothCodecStatus APIs moved from the non-SDK API list to the blocklist in Android 11 back to the non-SDK API list." into rvc-dev am: 44c43c51a5 am: 2766aa919e -s ours

am skip reason: Change-Id I29983284b1a1c271d983c99b286e204604abdc72 with SHA-1 4bbbfaa6ec is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12657847

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0aa23fd3d3dd78d9d86441add17345e56475e024