summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-09-07 00:16:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-09-07 00:16:58 +0000
commit0fde70d14839eaa8a06e95f4e9c4eeaee23e839d (patch)
treee82d4e7324f28c7c30bdfd4120ee5f5c80f0bd8b /libs/androidfw/ResourceTimer.cpp
parent6e0377a9dd1996154379e0e4c73cae5df55749e8 (diff)
parent5212647af4c09a7fdefb779f3ec6c09218a7ba83 (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 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: I49f4048a945f40f9b4e6a10a35ac2b824dee8142 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