summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager.cpp
diff options
context:
space:
mode:
author Gustavo Pagani <gustavopagani@google.com> 2023-09-13 13:56:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-13 13:56:45 +0000
commit5665ada5a02a2a092682bf4da5b6566ef383ab01 (patch)
tree9e6f33dbdf5aa5b9c68ed2929f4c733d34bb5aa4 /libs/androidfw/AssetManager.cpp
parent7ffa4494f261ea95cae9a239a06899b4b129fb8f (diff)
parent7ae7b9b503988f769e48920642ab93d52f969521 (diff)
Merge "Add Wear project folder with OWNERS file. Also add folders for: - Shared: common code shared between phone and wear app; - Horologist: components provided from Horologist;" into main am: ad2316cd10 am: 7ae7b9b503
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2748476 Change-Id: I1f3a6da48974b827e952862d1ff6f7c01481b84d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions