am 60ebc6a8: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:47:51 +0000 (15:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 22:47:51 +0000 (15:47 -0700)
commitd4d5d16612769a8dcfdad5cb43d73f292d1f2703
treedacf4b675ec8f111b3187535076a27498acd81a4
parent59b54d55772fbb4d6f28099f9128c14dd58f9dae
parent60ebc6a849e5f12169558465216ec3900a289c8b
am 60ebc6a8: merge in KQS81M

* commit '60ebc6a849e5f12169558465216ec3900a289c8b':
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE