diff options
| author | Bill Yi <byi@google.com> | 2016-09-27 03:40:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-27 03:40:32 +0000 |
| commit | 6d2c9c29dc2bcfbfdaf272cc3082fc7ae6fcda30 (patch) | |
| tree | e7bdf2e2679c92d360348ea7a790ecfbd735cd7a /libs/androidfw/AssetManager.cpp | |
| parent | 4b7d93c55d5961c4cdf8de92962951e1eece9f64 (diff) | |
| parent | 880e823e9e97f6cae0b96f434b0ad8a71f0fed9f (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 880e823e9e -s ours
Change-Id: I25f83a3ef505174745cd6196996de93ed6da9bd3
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions