diff options
| author | 2020-10-05 16:00:07 +0000 | |
|---|---|---|
| committer | 2020-10-05 16:00:07 +0000 | |
| commit | e7171c12fbb6a4e4cee632ccd0bd90612b2dfed4 (patch) | |
| tree | 0c029ad1b5822ba58f41827a57520a1029023981 /libs/androidfw/AssetManager.cpp | |
| parent | 4f8f275265ac77399111bfee16b974113f5b835f (diff) | |
| parent | 576055cbcb53d1930a087c7d8a92a45922edd62c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 576055cbcb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12763746
Change-Id: I1ea977e13f7c192488c77e84a4860db74f5758b6
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions