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