diff options
| author | 2017-02-16 15:44:12 +0000 | |
|---|---|---|
| committer | 2017-02-16 15:44:12 +0000 | |
| commit | 89adc92338cc3c6ee6135d2ac6d0030ae0479dda (patch) | |
| tree | 28871dc1b9a5dc4e5b65d245769692094c14575d /libs/androidfw/AssetManager.cpp | |
| parent | 9952a4f23cec9c9d287f3f9a3f44bd900def382d (diff) | |
| parent | 51df670652ba5229373ccb34a47d37718b8d89c7 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c527941449 -s ours
am: 51df670652 -s ours
Change-Id: I472ecff59c06ee733f639c292e8d44439678b4d2
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions