summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-12-03 07:56:57 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-12-03 07:56:57 +0000
commit8b2db65f1b7efb30e90687203d895cb09db36c6f (patch)
treee32eca44b4b21d74ef8730686d18c6b869c159fb /libs/androidfw/ZipFileRO.cpp
parent1686b5c3f58a7732d74f5f1cfa7dbfa3107dba06 (diff)
parentee549e515eedb86ff29917f2c8760b665e30d1ee (diff)
am ee549e51: (-s ours) am 0fcd3f41: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'ee549e515eedb86ff29917f2c8760b665e30d1ee': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions