summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-08-19 19:16:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 19:16:46 +0000
commit8892d180541e6ef6dd845cb99f462197dc28da6b (patch)
tree8a5fca08e278f408013e7f8e655484b2cd1dd453 /libs/androidfw/ResourceTimer.cpp
parent1f2c0991046c7a43b5a9e0ac8f6ce67275a6367c (diff)
parent674bfd36f7ec0f2bb2565110b7d7b03929ee7971 (diff)
[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 7053007275 -s ours am: b5c51a7b85 -s ours am: fe0441614e -s ours am: d547b26df2 -s ours am: 7adfc6a5cb -s ours am: 674bfd36f7 -s ours
am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 b479180b73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19459103 Change-Id: Id57a68d798e755a5677c341742025034dbb05b6f 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