tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent d28e24dde0d8cbede703daa6957cba76b05cf089
parent 6741f03cc7f1d58024eae18f34d633a2ae9f49fb
author Ed Heyl <edheyl@google.com> 1381273096 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381273096 -0700

am 6741f03c: merge in KQS81M

* commit '6741f03cc7f1d58024eae18f34d633a2ae9f49fb':
  Import translations. DO NOT MERGE