summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Song Chun Fan <schfan@google.com> 2022-10-18 23:41:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-18 23:41:18 +0000
commit0955d92a0f0492da44c7d66715b0caffc2330209 (patch)
tree35f41c815d2bc31a8701925639961e27992586e4 /libs/androidfw/ResourceTimer.cpp
parent5e31a6c1cf11679a936cccf99b3616772bed95a6 (diff)
parent43c97113383aef9df32757347b6936281781ed96 (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] [SettingsProvider] mem limit should be checked before settings are updated" into rvc-dev am: 43c9711338 -s ours
am skip reason: Merged-In I20551a2dba9aa79efa0c064824f349f551c2c2e4 with SHA-1 3c2723ffaf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20226472 Change-Id: I81f62d4067fb78fea0907c525841427c99fc548e 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