tree c02f69e681c89580afb358a19393a90e5a27ec79
parent eced15c440a8d3d71c6be37ee45a83b02821acf8
parent 18fc21daf5cad44d8dcae677cc1802a9fd166eeb
author Chia-chi Yeh <chiachi@android.com> 1285866659 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285866659 -0700

am 2cbb56f9: Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread

Merge commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01' into gingerbread-plus-aosp

* commit '2cbb56f961e4893a3bf7ded560d4bdbf45eabd01':
  KeyStore: Fix the return value when send() or recv() has an error.