summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-09-12 22:40:31 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-12 22:40:31 +0000
commit4e62eeff57432944dee31f3228cc7dd866f25ae9 (patch)
tree63441afd116346827d051498ac8d7d574fabe250 /libs/androidfw/ResourceTimer.cpp
parent96872eee27dd437a89e77842e78649782fc317f0 (diff)
parent96cdee89789cdf0347360899d7db673f2ed62c79 (diff)
[automerger skipped] Merge "Revert "Enforce ComponentName belongs to caller app"" into rvc-dev am: f8f07e22f1 am: b243407293 -s ours am: 07afb47507 -s ours am: 489f92832d -s ours am: 3bf1fa1198 -s ours am: 96cdee8978 -s ours
am skip reason: Merged-In Ibabff26c5a54e89c5dbe3a577f4c7739be6e2709 with SHA-1 8b7cf1993c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19781337 Change-Id: I758fb7296434eef7414459a98ef6f340518b8290 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