tree 2744eb63dbb3598dc34cdfa742eb6c5a90592a49
parent ebfb3a2e93dda7a8c9ab554378d211ec17df627c
parent da4023ff1609f0781e2d9dcface8aa4cf6698924
author Baligh Uddin <baligh@google.com> 1395342551 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395342551 +0000

am da4023ff: (-s ours) am 96c84de4: (-s ours) am d6e08fc4: (-s ours) Import translations. DO NOT MERGE

* commit 'da4023ff1609f0781e2d9dcface8aa4cf6698924':
  Import translations. DO NOT MERGE