summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 23:28:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 23:28:12 +0000
commit86f999bb9ee99c506756f587bb14c0c8e89660a5 (patch)
tree14ca60be1d96561c606342e86b8a6757c47b1197 /libs/androidfw/ResourceTimer.cpp
parentfef17fd0a7175c3e1f28265609cb3ba806105002 (diff)
parent093ed2b7077530ac41ca6c0cf592001a5baf4a54 (diff)
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-v2-dev am: 164f605cf0 -s ours am: 94c345049b -s ours am: 093ed2b707 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 d4b5212eb6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816753 Change-Id: I70c9f5b33e6dbc86a0c388c7ea41a8df8bf4ec95 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