tree d77a2938ae2aaea6a2310413fde6104117191e3c
parent 28d123c1880eafb31d1f0293117c8e90483b2429
parent ed6a0ca2f1547a6d1a6a334af1399eaa56c40c1c
author Baligh Uddin <baligh@google.com> 1414388807 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414388807 +0000

am ed6a0ca2: (-s ours) am 91baff48: (-s ours) am a2edad16: (-s ours) am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit 'ed6a0ca2f1547a6d1a6a334af1399eaa56c40c1c':