diff options
| author | 2014-03-25 21:22:44 +0000 | |
|---|---|---|
| committer | 2014-03-25 21:22:44 +0000 | |
| commit | 561ffd248fe67d9e583dd1b5dbf3deb7b02a394b (patch) | |
| tree | 5e2215e330f02f712aef78ac32b5909af114b36c /libs/androidfw/AssetManager.cpp | |
| parent | 62143f2f17222f2a52928ef14597662982ff604d (diff) | |
| parent | fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918 (diff) | |
am fe74cdcc: (-s ours) am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions