diff options
| author | 2016-11-21 01:53:18 +0000 | |
|---|---|---|
| committer | 2016-11-21 01:53:18 +0000 | |
| commit | bb7bad413a169ab1c70552b2b6d38299dfb2eb6f (patch) | |
| tree | f6da33736e419cb6e32d1af66c52c3e3fd868930 /libs/androidfw/AssetManager.cpp | |
| parent | db8719a721f25caba8b93cd85e4ce854b901b380 (diff) | |
| parent | 81abcfea7b5444e76617709293b5d2f8412a4ae1 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 81abcfea7b -s ours
Change-Id: I79c577d14b2953e44d9152a8179e3ce441c3cfe2
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions