am d4d5d166: am 60ebc6a8: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:58:17 +0000 (15:58 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 22:58:17 +0000 (15:58 -0700)
commit905010268bf8337922bb7f70f70ff96c1e9ebf1c
tree935c35d61dd294795fafde10067b977ad9193cf1
parent54d3b25c67757f435d597139b106c542e1e53e30
parentd4d5d16612769a8dcfdad5cb43d73f292d1f2703
am d4d5d166: am 60ebc6a8: merge in KQS81M

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