diff options
| author | 2017-02-16 15:43:05 +0000 | |
|---|---|---|
| committer | 2017-02-16 15:43:05 +0000 | |
| commit | 9952a4f23cec9c9d287f3f9a3f44bd900def382d (patch) | |
| tree | 28871dc1b9a5dc4e5b65d245769692094c14575d /libs/androidfw/AssetManager.cpp | |
| parent | 90bfda50bd8a5870e0f4de56bd0cb27411275de1 (diff) | |
| parent | 12adaa125e3136d4a380af4081c96205399b1ab8 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: aeab162647 -s ours
am: 12adaa125e -s ours
Change-Id: If3096bf1b094c844ce00992ce9e464b01e8eb47b
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions