diff options
| author | 2016-11-05 06:32:51 +0000 | |
|---|---|---|
| committer | 2016-11-05 06:32:51 +0000 | |
| commit | 9fbeb40fc983154680ece48b39813663babfcf6a (patch) | |
| tree | 8645d9abdcc6e7fb5d276618b03ec087b380ca15 /libs/androidfw/AssetManager.cpp | |
| parent | 34485976f4a1d4f34a736f6598aebf5832d15a94 (diff) | |
| parent | b14995516a38fdb3db547806c3289e06682aa1a2 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: b14995516a -s ours
Change-Id: Ibfd1760a251c164b392fb64640fc0c39e4ac0556
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions