summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-25 21:21:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-25 21:21:05 +0000
commitb763b4748f625547e4a665394d56afd1b6baa5da (patch)
treefba86ed96a817e479f6b7c8ff34e39b467be5925
parent1e75dfb8946bc6e6c11527a3495c1e5585e2bd77 (diff)
parent6babdc36cff3321281295b79ca6985e27f8fdb7f (diff)
am a52b892e: (-s ours) am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'a52b892eb32ba93832dc4e38f1d88d173f0b7be5': Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions