summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 23:29:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 23:29:40 +0000
commitfa78ae8329695a3689f9ea945fe9e33deff5eac5 (patch)
tree14ca60be1d96561c606342e86b8a6757c47b1197 /libs/androidfw/ResourceTimer.cpp
parentea188657144416a5e1196bd5bd5ef337efe657f7 (diff)
parent0fde70d14839eaa8a06e95f4e9c4eeaee23e839d (diff)
[automerger skipped] Merge "Trim any long string inputs that come in to AutomaticZenRule" into sc-dev am: a28f866052 -s ours am: a83761acb9 -s ours am: a9fafa01f2 -s ours am: 5212647af4 -s ours am: 0fde70d148 -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 99555b4371 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496 Change-Id: I21456f28f7d5d54440b81ff369fba351c7851817 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