diff options
| author | 2024-08-27 10:01:20 +0000 | |
|---|---|---|
| committer | 2024-08-27 10:01:20 +0000 | |
| commit | b712790f69548cd9986e100910834abceee05dd4 (patch) | |
| tree | 7dc26846a977ca3428e710acefff314365e5a785 /tools/aapt2/ResourceParser.cpp | |
| parent | 7683284cccca6d92b79a486d9043cb4271143443 (diff) | |
| parent | a45d0d8bf067a5875ceebf682d8c8967dabb803b (diff) | |
[automerger skipped] Merge "Set no data transfer on function switch timeout for accessory mode" into sc-qpr1-dev am: 1d5cac89a3 -s ours am: c1368ea9ef -s ours am: 9b98a360ec -s ours am: ea4656f6e9 -s ours am: 34fadb43c2 -s ours am: a45d0d8bf0 -s ours
am skip reason: Merged-In I698e9df0333cbb51dd9bd5917a94d81273a2784a with SHA-1 ef6f37e529 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28705341
Change-Id: I816499b0602f4c50b7c7fb866d3c0a01f1767eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceParser.cpp')
0 files changed, 0 insertions, 0 deletions