diff options
| author | 2016-11-21 02:11:59 +0000 | |
|---|---|---|
| committer | 2016-11-21 02:11:59 +0000 | |
| commit | 44ceb0eef5f9d62f50e53a08917e520decf2e76f (patch) | |
| tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 /libs/androidfw/AssetManager.cpp | |
| parent | d19aba43cd7f0204fafcd2af8c69df8436b4ce44 (diff) | |
| parent | bb7bad413a169ab1c70552b2b6d38299dfb2eb6f (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 81abcfea7b -s ours
am: bb7bad413a -s ours
Change-Id: I82a6ab8827a3b8416d797493f07f0b036af8d4ea
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions