summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-02-20 23:01:47 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-20 23:01:47 +0000
commit983f053f461e1eaec44013ab4eba700548329594 (patch)
treeb937df385a408d0709170f3f5b4252a38c22c96c /libs/androidfw/BackupData.cpp
parentc038cd95b9c5b76742cac4ff1cb36423b28f5d28 (diff)
parent46f1744acf7bd795ac80ed10a5b6bd3f03682b46 (diff)
am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '46f1744acf7bd795ac80ed10a5b6bd3f03682b46': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions