Merge "Catch HAL error that prevents retrieval of resolutions." into ub-camera-haleakala

author Sascha Haeberling <haeberling@google.com>

Wed, 25 Mar 2015 20:50:52 +0000 (20:50 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 25 Mar 2015 20:50:53 +0000 (20:50 +0000)
author Sascha Haeberling <haeberling@google.com>
Wed, 25 Mar 2015 20:50:52 +0000 (20:50 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 25 Mar 2015 20:50:53 +0000 (20:50 +0000)
diff --cc src/com/android/camera/CaptureModule.java
Simple merge
author	Sascha Haeberling <haeberling@google.com>
	Wed, 25 Mar 2015 20:50:52 +0000 (20:50 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 25 Mar 2015 20:50:53 +0000 (20:50 +0000)