summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 12:05:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 12:05:47 +0000
commita631986e08fe2137929fcf59f55516df9a4311c0 (patch)
treea9491ee942cf77798092f67c761c83051df8b71a /libs/androidfw/ResourceTimer.cpp
parent64e5e66ddf4f32a9d301ba4c3e8d09bbe5a00aae (diff)
parent4ab7818d1596b5bd34caed00f1c9cb5cdcc8847b (diff)
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into rvc-dev am: 69e4884a10 am: 97341f2b60 -s ours am: 84402c0922 -s ours am: 3c46d2931c -s ours am: 6903eccc48 -s ours am: 4ab7818d15 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537950 Change-Id: I24daf784f1d3af3b3d536e6862827a797b28965f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions