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