summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-06-29 14:08:14 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 14:08:14 +0000
commit511a1aca49587e07c1dc1b33eb216973875c1395 (patch)
tree152389a1aeb3c67afd1bfdaae9f1528a98320373 /libs/androidfw/ZipFileRO.cpp
parent62efaf1588d4c8e365dd8fd8f0ed99fed5ad4f01 (diff)
parente3fc5415ed65ee7ad451069022b5405361aeb2e7 (diff)
am e3fc5415: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'e3fc5415ed65ee7ad451069022b5405361aeb2e7': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions