am 4ed83a2b: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Tue, 8 Oct 2013 22:57:55 +0000 (15:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 8 Oct 2013 22:57:55 +0000 (15:57 -0700)
* commit '4ed83a2b6839be1c7b45db8ed8d54250f00fb65d':
  *HACK* assume android requests 1 more buffer then we specify


Trivial merge