| commit | 6807832ae4f044e26e7b661c0e76be27028cdae9 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Tue Oct 07 20:47:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 20:47:33 2014 +0000 |
| tree | aa2a568ac65b50f24a2599e89603773f3c547a0f | |
| parent | 97339c1bf93e2e6caf24770f2982a4efc7712428 [diff] | |
| parent | 1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2 [diff] |
am 1b19bc80: Merge "Catch error where framework is broken and returns no cameras." into ub-camera-glacier * commit '1b19bc806b42ad405a3ea60e5e6c4e278e0aaee2': Catch error where framework is broken and returns no cameras.