summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Austin Borger <borgera@google.com> 2023-05-02 17:31:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-05-02 17:31:50 +0000
commit0ef35d002065391f8403628f157455b4705d4004 (patch)
treeedcc6f834c304ff068493485fe4c96e0090b5387 /libs/androidfw/AssetManager2.cpp
parentfed2847bbe205bcee8d2b9c3ea2576cdf6364ca5 (diff)
parent34ee2b8e60fe3b400994d4918e8e75f182e3e7bf (diff)
Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into udc-dev am: 34ee2b8e60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22366514 Change-Id: Idcf03ed8ecd685bf2f1f9343fa415806e5dfbf17 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