summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 00:53:54 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 00:53:54 +0000
commit92393e347ecd8d62a0dc474fb001034c38fd7f01 (patch)
tree8476153cd9b928d1e3b4b4502822c1d7c3757902 /libs/androidfw/ResourceTimer.cpp
parentcbc99ef73ad8d55cddd6f5648419deafe71813f1 (diff)
parent27b3d9fc3b97899428cf1627e072aba924461d40 (diff)
[automerger skipped] Merge "Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege"" into sc-v2-dev am: 27b3d9fc3b -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20860033 Change-Id: If76163dd6d93b51dfcec711f83b8d94292d98e3a 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