tree 10da860fcff71886af91d082e31f0e1917926848
parent fe78e3f68f675e7aa04962628fdb88aa98c0664c
parent 1dfe7e3ad089cd293c8613559a57b02a0147cc77
author Baligh Uddin <baligh@google.com> 1414566289 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566289 +0000

am 1dfe7e3a: (-s ours) am 80480a9d: (-s ours) am bdcc7d4a: (-s ours) am be3adf36: (-s ours) am 80a603f7: (-s ours) am b178a362: (-s ours) Import translations. DO NOT MERGE

* commit '1dfe7e3ad089cd293c8613559a57b02a0147cc77':