commit | 364a2677c862af64f21b41dd3ab1b9e5c68b4ce0 | [log] [tgz] |
---|---|---|
author | Eino-Ville Talvala <etalvala@google.com> | Fri Jun 28 07:07:29 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 28 07:07:29 2013 -0700 |
tree | 1a53c2024ddfa6da614d2b33d6293bd4a490ee91 | |
parent | bdebd4817cfe49fafedfe8f9c65930e03f9b508b [diff] | |
parent | a691ff3c03e38e148bbefed35ebb15e552a12613 [diff] |
am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist. * commit 'a691ff3c03e38e148bbefed35ebb15e552a12613': Camera2/3: Don't allow recording and callbacks to coexist.