tree 10da860fcff71886af91d082e31f0e1917926848
parent bae94be9f28afc693b3df625e45e5a496aa525c0
parent 0a1d43253b8e991e2b253f2c01c2d37e51321ac0
author Baligh Uddin <baligh@google.com> 1414566262 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566262 +0000

am 0a1d4325: (-s ours) am 30146cb9: (-s ours) am 4e7091d3: (-s ours) am 73b1d566: (-s ours) Import translations. DO NOT MERGE

* commit '0a1d43253b8e991e2b253f2c01c2d37e51321ac0':