diff options
| author | 2016-11-21 01:57:55 +0000 | |
|---|---|---|
| committer | 2016-11-21 01:57:55 +0000 | |
| commit | c8d1cba0fa9f04131f7154533ad58c7eb3f1a812 (patch) | |
| tree | f6da33736e419cb6e32d1af66c52c3e3fd868930 /libs/androidfw/AssetManager.cpp | |
| parent | 584f7438ad06517865fa83069aac7f43121103f5 (diff) | |
| parent | 1ad0a421a65a56765e1e1b426bb40d859fae2fb9 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1ad0a421a6 -s ours
Change-Id: I2ecaab2b1546264cff2785bc5cfca2afcd666dd6
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions