summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-02-20 18:06:24 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-20 18:06:24 +0000
commit749e6b9cf21799aefe9accc50c60f6bfddf1545a (patch)
tree693a938d06c7cc9157dab1d9bc88ca7dc243905d /libs/androidfw/BackupData.cpp
parentbf2226ec7f9fcb0a2fc169df170c770363d9a3f5 (diff)
parent5da96060e61c3076d0a5cbd87a3f17254414afeb (diff)
am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '5da96060e61c3076d0a5cbd87a3f17254414afeb': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions