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

Merge commit '92cb1a026a2d6c594a63c18d8906271147eed85b'

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