diff options
| author | 2014-03-06 19:59:46 +0000 | |
|---|---|---|
| committer | 2014-03-06 19:59:46 +0000 | |
| commit | 3d207a2e5713c0b59efdf03c6096e3c1cefdfa0a (patch) | |
| tree | a516a5e0859e33f20f02b302c36ede0f9759e94a /libs/androidfw/AssetManager.cpp | |
| parent | 4d328a79bdee417c1248660b1c33b5cd86dbd814 (diff) | |
| parent | 7f2a7372850cc812873b5466cf4cbe7afceb8873 (diff) | |
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 '7f2a7372850cc812873b5466cf4cbe7afceb8873':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions