tree 10da860fcff71886af91d082e31f0e1917926848
parent c8adac069a79cc1ceec8d8b575f1856a6526a5d1
parent b241f0f307ebe11122216e269f7955e06350beaf
author Baligh Uddin <baligh@google.com> 1414566324 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566324 +0000

am b241f0f3: (-s ours) am 313693b0: (-s ours) am afce72a1: (-s ours) am 10daf361: (-s ours) am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit 'b241f0f307ebe11122216e269f7955e06350beaf':