diff options
| author | 2024-08-27 10:20:14 +0000 | |
|---|---|---|
| committer | 2024-08-27 10:20:14 +0000 | |
| commit | 90c553fe6b8336b97f1b5b04e9095aceabc7637e (patch) | |
| tree | f08b874c93877ea569a3b08c730f4058b7ce1095 /tools/aapt2/ResourceParser.cpp | |
| parent | 944240c74eda462aa0f0554557ed602ad89d191e (diff) | |
| parent | b9cbc94c28da3ad204a3fe0d302444543db151a6 (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: b712790f69 -s ours am: b9cbc94c28 -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: Ie5ba6f6ce5a27584b09e806a15ffb6be0bdd3877
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