tree 69916be4d4570001eaf3d7183188c806e23ba271
parent e0ed9dbcb8f3b67f66a1b2a1df264e3aee0bb81c
parent 92cb1a026a2d6c594a63c18d8906271147eed85b
author Chia-chi Yeh <chiachi@android.com> 1285879003 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285879003 -0700

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.