tree 10da860fcff71886af91d082e31f0e1917926848
parent 13f045d0091b828c7c2a68add53df0ec1b6549b2
parent 63428443cb81283f2d233fec22f8e941a53045a6
author Baligh Uddin <baligh@google.com> 1414566263 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566263 +0000

am 63428443: (-s ours) am b1f7866b: (-s ours) am 6b79a084: (-s ours) am 8609c70a: (-s ours) am 91b90c09: (-s ours) Import translations. DO NOT MERGE

* commit '63428443cb81283f2d233fec22f8e941a53045a6':