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