summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Jay Wang <jaycwang@google.com> 2023-08-06 04:21:23 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-06 04:21:23 +0000
commitbfe2e4e4b72324f130bd6983e9e08bdde56001d2 (patch)
treef345c7cc365bf735738239683259cab2ba70bce6 /libs/androidfw/AssetManager2.cpp
parent60e830f71cb2bb0dfa466579172fcb83584da6af (diff)
parent2da2681ba2f3cad90001682d8194ab290236730d (diff)
Merge " [Battery] Add INCOMPATIBLE_CHARGING_BATTERY_ICON flag." into udc-qpr-dev am: 47e7d5c654 am: 2da2681ba2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24264684 Change-Id: Ie56c1a2c9167448e4d11f965d91d457efab29f45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions