summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2022-10-19 01:00:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-19 01:00:13 +0000
commitc484099885998580d10de07a83bb2e67a1559405 (patch)
tree0d0cd1f4fbe2c39b7fa4e84b14d1ce8c7eeb0d32 /libs/androidfw/ResourceTimer.cpp
parentfd8fc42b0f32cbc3c81928fa3e4e73f2ae5c1764 (diff)
parent5d30049f5ad832f3ff2510c2e9673286621743b2 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into sc-v2-dev am: 443d29b752 -s ours am: 5d30049f5a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226644 Change-Id: I4fe51522a55051b5b027b4a6fd16fe5dc8181e6e 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