summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 13:16:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 13:16:40 +0000
commita753c427c95a77a6612b241172518e6dd86f5e13 (patch)
treec825fd9ea883ab1d72f43cfaa5af8d778f3a5b61 /libs/androidfw/ResourceTimer.cpp
parentfd0ccaf6e6d7e4dab61c8f3db6f5b1f76d9705cc (diff)
parentc4260607d887434ef436288c629803c7cfb821b0 (diff)
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into qt-dev am: b6d3c1a021 am: d6b9cb3584 -s ours am: c9d18836c2 -s ours am: a173229e2f -s ours am: f6d78a9691 -s ours am: 5750dcd2f3 -s ours am: f9c2abf201 -s ours am: f1b49e2f12 -s ours am: fe324c9856 -s ours am: 14833d49eb -s ours am: c4260607d8 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069 Change-Id: I7f22b9c996a4127172cf8bcc99e719ce848b80a8 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