summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-08 00:51:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-08 00:51:49 +0000
commitfc6636c8740fc5546837bf9278766ba3bc3d2d07 (patch)
treed18814e8bfbb13ffa89a35a2ded2939e216dced6 /libs/androidfw/ResourceTimer.cpp
parent1510087a620dd272d04c13626ac7093f4b7a5c04 (diff)
parentdbb75ee7a6c5e1dc53263486f4bcbe123d30c9a8 (diff)
[automerger skipped] Merge "Fix system zen rules by using owner package name if caller is system" into qt-dev am: 3fe8fdc4dc am: 85d0cb310c -s ours am: 4bc4a7d756 -s ours am: 5725377e5c -s ours am: c73ff23f81 -s ours am: 25ab88ccc3 -s ours am: 4082fa21aa -s ours am: dbb75ee7a6 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 0b262d0ae5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480 Change-Id: I1c79ab13efdab5b2d3fa06ad93110106b6538915 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