diff options
author | 2021-04-12 06:41:57 +0000 | |
---|---|---|
committer | 2021-04-12 06:41:57 +0000 | |
commit | c7469537d945dd5bff270545a7b13e112a553411 (patch) | |
tree | b68d9d8abb15f933c549633519b56f7481650648 /libs/androidfw/ZipFileRO.cpp | |
parent | 2054e9cd975d2f02f8ca1cb472d8fcad5b5eceb6 (diff) | |
parent | 9e7226e4ef96e1b32f2bf3a24162cd3724b4dc9c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: d655d43041 -s ours am: 9e7226e4ef -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14156883
Change-Id: I3686bfa1df93c8011b45b5a4c8e054f3bc1b9080
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions