summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Louis Chang <louischang@google.com> 2023-01-06 04:36:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-06 04:36:14 +0000
commit7653fbf9e0bdff4d8592c4cd67bc34eb28c27153 (patch)
tree369a343baddabe1d06e0a5953179ca9ad241e8d4 /libs/androidfw/ResourceTimer.cpp
parentf69d1016aff7516c87f66af056e9a5316dd25495 (diff)
parente77c3acf60b7363d19b6eeab1c34c5d4ad885a31 (diff)
[automerger skipped] Revert "[RESTRICT AUTOMERGE] Trim the activity info of another uid if no privilege" am: 53a76608e5 am: f83968c4c5 -s ours am: 166a094ebf -s ours am: 6379ab13ed -s ours am: e0fdb37928 -s ours am: 0011edcc2a -s ours am: 56be1fc3c4 -s ours am: e77c3acf60 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20850158 Change-Id: Ic71a2051a558200e568871675dd70dd1d01068b6 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