tree f5e9b87306827ed09804a777e300745f222de28b
parent e78691eef11fb7d421d1ab110c29f5904cf72fe4
parent eb0cc542fad264d53f8d31e6421aa0f8833ffd3b
author Baligh Uddin <baligh@google.com> 1380582932 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380582932 -0700

am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

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