summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-02-20 18:09:56 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-20 18:09:56 +0000
commita935d31ca87146990010121b576506faef803404 (patch)
tree9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 /libs/androidfw/BackupData.cpp
parent72edb1b78d0316055b40931138ee75a99766995d (diff)
parentbf2226ec7f9fcb0a2fc169df170c770363d9a3f5 (diff)
am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'bf2226ec7f9fcb0a2fc169df170c770363d9a3f5': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions