OSDN Git Service

am 92db0c12: am 66281c3a: Camera: Don\'t overwrite the error status
authorZhijun He <zhijunhe@google.com>
Mon, 16 Sep 2013 17:55:26 +0000 (10:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Sep 2013 17:55:26 +0000 (10:55 -0700)
* commit '92db0c12caec61485851c87faee9a78245ae1fde':
  Camera: Don't overwrite the error status


Trivial merge