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)
commit049dc0cc7f54707f8759ba07cae4f18d902686b4
treeece8d015272f524f5e487444914a8d58bcae21b7
parent9dc5f4f7212c37eac1801eb0d3d14f6524e22708
parent4ed83a2b6839be1c7b45db8ed8d54250f00fb65d
am 4ed83a2b: merge in KQS81M

* commit '4ed83a2b6839be1c7b45db8ed8d54250f00fb65d':
  *HACK* assume android requests 1 more buffer then we specify