diff options
| author | 2016-11-21 02:20:24 +0000 | |
|---|---|---|
| committer | 2016-11-21 02:20:24 +0000 | |
| commit | 059022bc1ba2f2bf2ba7f46d79f69444fcf81a78 (patch) | |
| tree | 2406fe8280cf92fb931fa11c7e69e351249326c5 /libs/androidfw/AssetManager.cpp | |
| parent | b4013c83bee684a8f208fec8f09c286a32522c1d (diff) | |
| parent | 00544de5d07b7f37863e23634881af0fc3e84e61 (diff) | |
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: b9762351a3 -s ours
am: 00544de5d0 -s ours
Change-Id: I6f8aabe8b93dd3a81f615bdc33cd7ce8997a65e8
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions