summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Christopher Ferris <cferris@google.com> 2023-08-04 21:07:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-04 21:07:56 +0000
commitf4ce1f81d9726d17738e5f3a13d92da7fc2f14ca (patch)
tree118daebe22871cccc9340561072265560699ef82 /libs/androidfw/AssetManager2.cpp
parentd66fa147503cf78ca3afba5a86386b5fb596c054 (diff)
parent074e2397560bad6e79bedded9cbcf885e2a27b85 (diff)
Merge "Fix problem of logd restarting." into main am: 5a3f2ab2a8 am: 1c18753d88 am: 2acb379fc3 am: 3dfa2274f0 am: 074e239756
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2691347 Change-Id: Ib26838371fa05dfd1c694c1aa160a8c2f5e1f48d 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