OSDN Git Service

am 8850b8e7: Merge "Fix NPE for when camera is disabled" into gb-ub-photos-bryce
authorDoris Liu <tianliu@google.com>
Thu, 21 Feb 2013 22:17:46 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Feb 2013 22:17:46 +0000 (14:17 -0800)
* commit '8850b8e776d984a3924e9849629f096c57920a7a':
  Fix NPE for when camera is disabled


Trivial merge