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