tree 62d048de544c7b3d290d1914f836253523b76c79
parent d77057a77b8a1887f873fbb4fafbd4dd65a98e53
parent 33ce277a53ead81c2dc60b5923c8f8eb129e7e59
author Baligh Uddin <baligh@google.com> 1383317612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383317612 -0700

am 33ce277a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-jetsonic

* commit '33ce277a53ead81c2dc60b5923c8f8eb129e7e59':
  Import translations. DO NOT MERGE