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