summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2019-09-14 13:09:07 -0700
committer android-build-merger <android-build-merger@google.com> 2019-09-14 13:09:07 -0700
commit48dcfd57cf3a8e59a18f8d52d6f81e5a301106d7 (patch)
tree2e5feaa00f8c64e25f43e9d07585d008051d938f /libs/androidfw/ZipFileRO.cpp
parenta8d99bd9d2ab161847730a902d74776530cc68d9 (diff)
parenta83b18cc34ae8ddba6698e56c6c0f6208dfbe23f (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: a83b18cc34 -s ours am skip reason: subject contains skip directive Change-Id: I6c049537831a6749b1933cbbdb831d1cffa770fb
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions