summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-12-11 19:46:48 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-11 19:46:48 +0000
commit4e1fe29cf0b459d180969f834241e1700c37b210 (patch)
treedd8f8b9c17a04e508a49c464182950085079d449 /libs/androidfw/AssetsProvider.cpp
parentc02e647603a6682fcc5744db685c0e8f75eebef6 (diff)
parentd77aaf6a6e5cd51568f707571a45a6c7b91ddadb (diff)
Merge "Bluetooth: Check state correctly when client wants to bind" am: d77aaf6a6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1524638 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I30180ec8e75f6c619dbe8492e74324d2e38d6a3f
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions