summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Iván Budnik <ivanbuper@google.com> 2022-08-19 19:21:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-19 19:21:10 +0000
commitbe4144844d7f25f923a7bf499ac097a60c4b8dfa (patch)
tree8a5fca08e278f408013e7f8e655484b2cd1dd453 /libs/androidfw/ResourceTimer.cpp
parent74656ff8da7c4d7298ab71f57ed826a7009b799f (diff)
parent6fdaee392a2d7b16cc75904b933ae892326e4db2 (diff)
[automerger skipped] Merge "Enforce ComponentName belongs to caller app" into sc-dev am: 7053007275 -s ours am: e711745a18 -s ours am: 9fbc372e61 -s ours am: 073d534966 -s ours am: d10cfead80 -s ours am: 55eeca64ad -s ours am: 6fdaee392a -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: Ia9dd3015b88a37f3c811a121cbc364c7454ad0f0 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