diff options
| author | 2019-09-03 12:48:42 -0700 | |
|---|---|---|
| committer | 2019-09-03 12:48:42 -0700 | |
| commit | 406c55da1c113887f233f29909d10d59d773cc30 (patch) | |
| tree | 5aa8aceb580b4f0040b4276e97956ca384a12251 /libs/androidfw/AssetManager.cpp | |
| parent | d732bd37ef03feae700fe4e1fa8b5bf9898192bb (diff) | |
| parent | 7fad65392a3c0f165f099183dd12b58628274f92 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 7fad65392a -s ours
am skip reason: subject contains skip directive
Change-Id: Ia9c639943c93bbc7a671d8c28fa30e0c5daca12e
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions