diff options
| author | 2023-07-20 21:32:44 +0000 | |
|---|---|---|
| committer | 2023-07-20 21:32:44 +0000 | |
| commit | f68b91bf5f5df678bd698e88cf5aefd6ae4bc506 (patch) | |
| tree | 37df10baa5fce894200a0f13271decb16c080799 /tools/aapt2/ResourceValues.cpp | |
| parent | 901c402a642b807dd17cb52f226dabe43e805f9a (diff) | |
| parent | 46d348151c3f53806b05fff93b408612a3729776 (diff) | |
[automerger skipped] Allow additional reason/surface combinations for cancel am: 4c39ad7c8f am: 3568caef1b -s ours am: 59c41e47a0 -s ours am: 46d348151c -s ours
am skip reason: Merged-In I054969dc82da5277002049d063abdb044dcc811e with SHA-1 4c39ad7c8f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24147764
Change-Id: I109641917b5cdb64203b98a8536d0a883debf5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceValues.cpp')
0 files changed, 0 insertions, 0 deletions