tree cba62d0d64153aa2169651696bc238591341d679
parent 0a1d43253b8e991e2b253f2c01c2d37e51321ac0
parent b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea
author Baligh Uddin <baligh@google.com> 1414085341 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085341 +0000

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

* commit 'b1f7866b65c80a0b5599acf0cd2dbf50876bb9ea':