tree af9ce4eff6c6988752c6266333e77c5b6cf90c6e
parent 66cba496ef5a01b0d82be1503ce5675836334406
parent dc1f5c4dcb39146320a692606a7371d130afbfe7
author Baligh Uddin <baligh@google.com> 1396473400 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396473400 +0000

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

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