diff options
| author | 2022-08-26 22:25:28 +0000 | |
|---|---|---|
| committer | 2022-08-26 22:25:28 +0000 | |
| commit | fd28d3188daed290544a9d1e6ac65fb986db4b61 (patch) | |
| tree | fb880b555c807beefe74ff084a21e5cd75bcc5e6 /libs/androidfw/ResourceTimer.cpp | |
| parent | 0f92cb44ae58975ae2b45d4c2786dea99b076810 (diff) | |
| parent | 72696bcf1d7a2172664c1beab5b4b25ba34e43a0 (diff) | |
Merge changes from topic "am-6c64ec0d09b142c78bff33f7e98a7114" into tm-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 53044cb6a5 -s ours am: 8dfef1a9e5 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1936ad5561 -s ours am: 15263d96e5 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 4eea3945dd -s ours am: a8785ad31b -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2d7e03b7c8 -s ours am: 8aed9b7a3d -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 2b62802b32 -s ours am: 4bc2565e5a -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 279e10cfb9 -s ours am: dd63893e7e -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 9507d03bdf -s ours am: c25bfbe0da -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa981370a5 -s ours am: 36aca115d3 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: ad32bdd4a2 -s ours am: f62f85c074 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51d338b81f -s ours am: 58b3d849a7 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0439c0af16 -s ours am: 238f1580d0 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 08a4ec8276 -s ours am: 713822bd37 -s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: a1fb463fba -s ours am: f8ca0164c3 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1d257773a3 -s ours am: fd1aab6b25 -s ours
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions