summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 12:07:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 12:07:04 +0000
commitc5e852a7c8e9bbe306f493412e6bb79063a45965 (patch)
treea9491ee942cf77798092f67c761c83051df8b71a /libs/androidfw/ResourceTimer.cpp
parent4397262705d6b4aa6cbb69d6ad28367f6cd9c5a4 (diff)
parentb49e7c923df32344c3519bdcf2dcbdbfc5dbc5fd (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: b49e7c923d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537950 Change-Id: I6a6686c180634b72f8adc94de226f31d66322916 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