tree 57c45e0bd1e86409708e013eaca53be3e6952209
parent 516b7ce0106d1b8715adcea68809d0fe4473979b
parent b3f177b455b58f351b3c34432503fc77db1bac2d
author Baligh Uddin <baligh@google.com> 1394729243 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394729243 +0000

am b3f177b4: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-nova

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