diff options
| author | 2014-03-07 02:55:24 +0000 | |
|---|---|---|
| committer | 2014-03-07 02:55:24 +0000 | |
| commit | 7d42b895e644bf5ef70ccc974e4b5d759d1d8ddf (patch) | |
| tree | ce54c7deada8075b84346e674699f7f1350dd6f4 /libs/androidfw/AssetManager.cpp | |
| parent | 858a0405ec86328f2b853367be889ad9f64d40a4 (diff) | |
| parent | 3d207a2e5713c0b59efdf03c6096e3c1cefdfa0a (diff) | |
am 3d207a2e: (-s ours) am 7f2a7372: (-s ours) am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '3d207a2e5713c0b59efdf03c6096e3c1cefdfa0a':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions