summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-03-03 23:48:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-03 23:48:03 +0000
commit8985631f6d2283c9644231e2812375a0fa93bce4 (patch)
treeadf23137f85d73218ddb61746522ab54aa203f17 /libs/androidfw/ResourceTimer.cpp
parent483de8b96c45d7e863db47930cbc37add63dac8b (diff)
parent4abae9ab00b0a03bfce6ba9444ae3398ab147ba2 (diff)
[automerger skipped] Merge "DO NOT MERGE: ActivityManager#killBackgroundProcesses can kill caller's own app only" into rvc-dev am: 5d4989646c am: 41c877702a -s ours am: 654f0abf49 -s ours am: b0db9bf23c -s ours am: 7e920c1c3f -s ours am: d3b4e36921 -s ours am: 4abae9ab00 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20309299 Change-Id: Ic486b64666592cf74cd130c924c76acade376e75 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