diff options
| author | 2014-07-06 19:56:15 +0000 | |
|---|---|---|
| committer | 2014-07-06 19:56:15 +0000 | |
| commit | 2e2090c5a2069fe876b881da15a3d7f0c4fd6685 (patch) | |
| tree | 23177b00a1a6802be35beea4819902b77421124a /libs/androidfw/AssetManager.cpp | |
| parent | f4bf64bd2f5067510fe46e889b5dfb93297f32e1 (diff) | |
| parent | b33e23ead7e9b9a1327168ffcca48a3cbe668398 (diff) | |
am b33e23ea: (-s ours) am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'b33e23ead7e9b9a1327168ffcca48a3cbe668398':
  Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions