am 74691939: am 6741f03c: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Wed, 9 Oct 2013 16:12:39 +0000 (09:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Oct 2013 16:12:39 +0000 (09:12 -0700)
commit983c94169d185363fcfe8f4da107921bc77a20ff
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904
parentc1cc6e3f74b4f99fdd929788bb01ec260270842f
parent74691939efdd6287721a93a95479f4d7cb708dbe
am 74691939: am 6741f03c: merge in KQS81M

* commit '74691939efdd6287721a93a95479f4d7cb708dbe':
  Import translations. DO NOT MERGE