tree a412a71fe4d215eb6da34a5396721e5bf2caa50b
parent a3fb78f030bdb92d1f46bde935e3a1a5bed24f2e
parent 7a3ce60cfe7f5a554ab8edeb08c203196b17b164
author Senpo Hu <senpo@google.com> 1413313952 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413313952 +0000

am 7a3ce60c: Merge "Prevent NullPointerException of PhotoModule in quick resume-pause." into ub-camera-glacier

* commit '7a3ce60cfe7f5a554ab8edeb08c203196b17b164':
  Prevent NullPointerException of PhotoModule in quick resume-pause.