tree 217f6d024d86fcde7eba1817c8e3a1f4883b49b3
parent 53d819687e29ea8b400f4852295fbec3fabb9f7b
parent 8dbf3b8df0f29d457155e5831dbecf5ba4fff98e
author Baligh Uddin <baligh@google.com> 1352315700 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352315700 -0800

am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

* commit '8dbf3b8df0f29d457155e5831dbecf5ba4fff98e':
  Import translations. DO NOT MERGE