diff options
| author | 2022-08-01 17:21:24 +0000 | |
|---|---|---|
| committer | 2022-08-01 17:21:24 +0000 | |
| commit | 19af1b4293ed3d571108c3845aaeb3dc6756a866 (patch) | |
| tree | a023ac3bdfff123b85c5723683d51b0e7d91d5a3 /tests/SystemUIDemoModeController/Android.bp | |
| parent | 0076474ed571bdf3493f7769a87bd19486fc86e6 (diff) | |
| parent | c7a983be9859cc7681a506aabe6013f92f09cfd2 (diff) | |
Merge changes from topic "am-a8bd616d471949689504ebc9266e4940" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: fef13a7112 -s ours am: b7b379da75 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d9801fb28 -s ours am: 7a902428b0 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4f940a17b7 -s ours am: a903588d3c -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d13d3c015 -s ours am: 93805b04c5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 52a3933472 -s ours am: 288fd779db -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 810ed7e3c1 -s ours am: 8c768fdf09 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 949661da21 -s ours am: d4670a5cc8 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22bf769a25 -s ours am: d9a110d9f4 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 96ab3b3760 -s ours am: 15c9d8c757 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 535d8de1a6 -s ours am: 1d14909475 -s ours
Diffstat (limited to 'tests/SystemUIDemoModeController/Android.bp')
0 files changed, 0 insertions, 0 deletions