summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2022-10-19 02:05:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-19 02:05:51 +0000
commit1725960726d6b7bc1f259277d1fb793944f9e3ad (patch)
tree8a090c8620bda33e9a0bcfca3c7edef444a6ff46 /libs/androidfw/ResourceTimer.cpp
parent6305e6dd980b50a78fa7e9dcdee83c767307739a (diff)
parente7c9c7dc7089f79f54b3b97eefeda1b0c5d6c116 (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: e3560bbd03 -s ours am: d007858951 -s ours am: e7c9c7dc70 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226644 Change-Id: I151b0ad1e6b6fcf9813ac36213fd909660ec8444 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