summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 12:06:16 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 12:06:16 +0000
commitf12425b35d42c1182cec4389aa541349f79fc8e1 (patch)
treea9491ee942cf77798092f67c761c83051df8b71a /libs/androidfw/ResourceTimer.cpp
parentaac7a63645b65385145e6f15e8c573ae338f65ec (diff)
parenta5cc3212f2bb97be475f9bdc6428abaeba99ae49 (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: 4db2250a8b -s ours am: e72dd25026 -s ours am: a5cc3212f2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069 Change-Id: I1a18764a6461de641b7069d5f3c8c4cf6b5e5e18 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