summaryrefslogtreecommitdiff
path: root/libs/androidfw/BackupData.cpp
diff options
context:
space:
mode:
author Baligh Uddin <baligh@google.com> 2014-02-20 23:02:06 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-20 23:02:06 +0000
commitd87e57f6980847adeed04a6795e28b26ec4008e1 (patch)
treeb937df385a408d0709170f3f5b4252a38c22c96c /libs/androidfw/BackupData.cpp
parent983f053f461e1eaec44013ab4eba700548329594 (diff)
parentc87c6a2a4630e53d8dc07eb53095776fa31c463f (diff)
am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'c87c6a2a4630e53d8dc07eb53095776fa31c463f': Import translations. DO NOT MERGE
Diffstat (limited to 'libs/androidfw/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions