tree 84e205f4f99438ac82eb12047dee2074beb6697b
parent e68f6219b35f76f22d92406d2fbe865ed3314e53
parent 782bac7b2818d96e56ab1e304f9f150bef70e8aa
author Senpo Hu <senpo@google.com> 1414384371 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414384371 +0000

am 782bac7b: am 21e5d240: am 70a82d9d: Add null check in AndroidCameraSettings.

* commit '782bac7b2818d96e56ab1e304f9f150bef70e8aa':