tree 10da860fcff71886af91d082e31f0e1917926848
parent 00ee72e30b5fc21fa5ef5276434c9fc1e87a70aa
parent 862001a2ea1bb9565d8d945f0a4b27f9134a3ba5
author Baligh Uddin <baligh@google.com> 1414566337 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566337 +0000

am 862001a2: (-s ours) am 6c983895: (-s ours) am fdfebdad: (-s ours) am 0493fb93: (-s ours) am 0effb652: (-s ours) am e0b9a1f7: (-s ours) Import translations. DO NOT MERGE

* commit '862001a2ea1bb9565d8d945f0a4b27f9134a3ba5':