summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-09-07 11:31:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 11:31:24 +0000
commit7f6087b8b52cc5259d838ca19d251e47c9d14b38 (patch)
treee82d4e7324f28c7c30bdfd4120ee5f5c80f0bd8b /libs/androidfw/ResourceTimer.cpp
parenta60bd0d043c5d41a256a3c873db5c8ce4c5bc367 (diff)
parentdd5160a2cc41df42e4005bf8e1063b9b2481d486 (diff)
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into tm-dev am: dd5160a2cc -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 ff7be9912f is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19641683 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19748522 Change-Id: I8abe42c9879cca870960770d343fde5abc142930 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