am 049dc0cc: am 4ed83a2b: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 6 Dec 2013 21:04:24 +0000 (21:04 +0000)
commit7d5f1d21937f73102e47ea094112f913b0a62923
tree3ad58971581c1f9a1026c8e163ca90737bc306d5
parentba949fe2d7f7a216c7992be462136ba9f0da145e
parent049dc0cc7f54707f8759ba07cae4f18d902686b4
am 049dc0cc: am 4ed83a2b: merge in KQS81M

* commit '049dc0cc7f54707f8759ba07cae4f18d902686b4':