diff options
| author | 2019-07-05 18:47:31 -0700 | |
|---|---|---|
| committer | 2019-07-05 18:47:31 -0700 | |
| commit | 0e5c34bb381e5ab995c7656929e2532af9b8957f (patch) | |
| tree | 780172efaf7e836ba9285414bb4b27cd76dcd4da /libs/androidfw/AssetManager.cpp | |
| parent | b26223d9c18f21c5620797a9db6ca6e6b586d026 (diff) | |
| parent | b37de73103e2b155dbd77909587d65cf390f0d6e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: b37de73103 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a4b41b10d4f468b5d78e396d7f1634ab4762eda
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions