diff options
| author | 2019-08-08 18:58:34 -0700 | |
|---|---|---|
| committer | 2019-08-08 18:58:34 -0700 | |
| commit | 608ad1eefdcd8c13f88da6211a5c2c0249c74b08 (patch) | |
| tree | 6f17c97ad073fa16f4fcca76e3b4c5fa290635bc /libs/androidfw/ObbFile.cpp | |
| parent | c3d83841623389e600f002b4842d4d7748714188 (diff) | |
| parent | 8986f7c5a0b9d438e069a0b8a2045c6229ab6324 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 801d177995 -s ours am: da046065c4 -s ours am: c0491bf9a9 -s ours
am: 8986f7c5a0 -s ours
am skip reason: subject contains skip directive
Change-Id: I321a8985140a10dddbe92cd435e81105bd409874
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions