summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-09-07 11:32:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 11:32:26 +0000
commitfcd6a07c5b6b40b0d490f9af80652e8875e4f9f7 (patch)
tree2d4fe716b00e2474a72d0f7cc46f339b3b4ed701 /libs/androidfw/ResourceTimer.cpp
parent00437fe9ead62bd8c2dd0e47ae2f49a4a12cace0 (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: Ie290fac1773e13cb988cfbd7a5244d2cbcb39d39 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