diff options
author | 2015-06-29 17:14:12 +0000 | |
---|---|---|
committer | 2015-06-29 17:14:12 +0000 | |
commit | ea8f842fb83cfbc9410da685ee7726bc1a425ee5 (patch) | |
tree | f8e445c3bbdacdf7a94cdf8f60411353981e6ebf /libs/androidfw/ZipFileRO.cpp | |
parent | 9117f34bea08c3166a5eda636226a16d6a5fe232 (diff) | |
parent | f07db6772496467cadc31832373c303d2363e05e (diff) |
am f07db677: (-s ours) am b05e2286: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit 'f07db6772496467cadc31832373c303d2363e05e':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions