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