diff options
author | 2021-05-18 15:18:08 +0000 | |
---|---|---|
committer | 2021-05-18 15:18:08 +0000 | |
commit | 5ce0c35e11cf39bb8266a1e6a862eae85c81d47b (patch) | |
tree | 012e50136a49e1513585715e52f3250eb5673293 /libs/androidfw/AssetsProvider.cpp | |
parent | a7900ad335e1821aa65d2f6d71167977a79f5fea (diff) | |
parent | 524b020eb06480596534b754dfab6f4946238c67 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 524b020eb0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14613892
Change-Id: I9fb784230c3d2d4d135fcd17e4a7cfaa1e50706c
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions