tree b91ce25e110d6212cb7789c8a49660932d69369f
parent 0c52af7a3e137f131dcec1c45589291296911a87
parent f9dd751e527f6857054ce67beb4cbacfad6d0c92
author Jay Shrauner <shrauner@google.com> 1389219868 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389219868 -0800

am f9dd751e: (-s ours) Merge "Import translations. DO NOT MERGE"

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