diff options
| author | 2022-09-07 01:55:40 +0000 | |
|---|---|---|
| committer | 2022-09-07 01:55:40 +0000 | |
| commit | 2f473648da76323d35fb28177a625c237533e02d (patch) | |
| tree | 0a9a50137b02aa5d4ce99e22651672fb2a28ea98 /tools/aapt2/ResourceTable.cpp | |
| parent | f623a4d6fd9fb60e20bec49bcba1d96946830d4c (diff) | |
| parent | c3fa41f3dacf1c797c3f7b87cdd8bf4b3d1c5764 (diff) | |
Merge "[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" into tm-d1-dev am: 34776f6548 -s ours am: c266737c9b -s ours am: c3fa41f3da -s ours
am skip reason: Merged-In I110172a43f28528dd274b3b346eb29c3796ff2c6 with SHA-1 3d8504587c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816496
Change-Id: Ic0edbe56a09c637ee6d7262c9c47e591400ee018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions