diff options
| author | 2014-03-06 19:40:40 +0000 | |
|---|---|---|
| committer | 2014-03-06 19:40:40 +0000 | |
| commit | 7f2a7372850cc812873b5466cf4cbe7afceb8873 (patch) | |
| tree | bb5e0f2fe278927fa6edc15efd04af7c9500bb9d /libs/androidfw/AssetManager.cpp | |
| parent | a43f7cb01e3638607949465d7a872bd5b0ce7253 (diff) | |
| parent | c7a535c552f8853076ba104e7948f7c1d324d47a (diff) | |
am c7a535c5: (-s ours) am d010cf12: (-s ours) am 221849b6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c7a535c552f8853076ba104e7948f7c1d324d47a':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions