summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Lokesh Kumar Goel <lokeshgoel@google.com> 2023-08-22 03:53:08 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 2023-08-22 16:45:04 +0000
commit67883d3eb63af08f622636ad26ce416cd377e58a (patch)
tree918cb64ccc9000a043d49950bef047e1ecdd5085 /libs/androidfw/FileStream.cpp
parent84dd64521a447f20817d778dac827034794e2044 (diff)
Revert "Import translations. DO NOT MERGE ANYWHERE"
This reverts commit 5e7f8d8aca7b040f5ab57af3af4a72095d425e0c. Reason for revert: coastguard doesn't flag the resource file CLs as already merged. Instead cherry-picked it again causing build failure with error: frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: duplicate value for resource 'string/controls_media_empty_title' with config 'zh-rCN'. frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml:966: error: resource previously defined here. frameworks/base/packages/SystemUI/res/values-zh-rCN/strings.xml: error: file failed to compile BUG:296960974 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:202164834a9139bdf1ec1e53b65c3911002f2909) Merged-In: I20fe50d806dc799328da7a594cfd42b5c20b4f02 Change-Id: I20fe50d806dc799328da7a594cfd42b5c20b4f02
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions