diff options
| author | 2016-11-21 01:54:52 +0000 | |
|---|---|---|
| committer | 2016-11-21 01:54:52 +0000 | |
| commit | fb8a4d17c2b6ae497634a8f6742f6f9cf20a3887 (patch) | |
| tree | f6da33736e419cb6e32d1af66c52c3e3fd868930 /libs/androidfw/AssetManager.cpp | |
| parent | 3ea5862bb1a282952f9a2e525af037b42a61b5b8 (diff) | |
| parent | dc92c70106260e44c7ecdfa9d59bf0f4f61cea7f (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: dc92c70106 -s ours
Change-Id: I57ad69492d4b7caabbf2bcfa1811997ea56712a2
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions