summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Geoff Mendal <mendal@google.com> 2015-06-29 13:58:19 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-29 13:58:19 +0000
commitda616ea6644c5b363d770badf22db44ed25cc267 (patch)
treec68f5073558d29f32208db1a2a9a82fa0bf34811 /libs/androidfw/ZipFileRO.cpp
parent45dab52ce84b4ecc6461260a28f1a8f72158be9f (diff)
parent62efaf1588d4c8e365dd8fd8f0ed99fed5ad4f01 (diff)
am 62efaf15: (-s ours) am 208daa1d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '62efaf1588d4c8e365dd8fd8f0ed99fed5ad4f01': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions