OSDN Git Service

am 37ba3571: am df36ec57: am 0e6efbcc: Merge "NPE fix when we failed to open the...
authorztenghui <ztenghui@google.com>
Tue, 15 Oct 2013 17:18:41 +0000 (10:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Oct 2013 17:18:41 +0000 (10:18 -0700)
* commit '37ba3571d7e0c6c6d6d5ae9bbf0cee989436f319':
  NPE fix when we failed to open the camera


Trivial merge