| commit | 23a2aa993c7997913f32cd5eb69e12d4f6e0e354 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Sun Oct 13 16:07:48 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Oct 13 16:07:48 2013 -0700 |
| tree | 0fbe08062089c3c305d4f1f8710e2e43ab791c33 | |
| parent | 331201407e613e5a243b8cf6e8f3d5bdb647e6c5 [diff] | |
| parent | 704530edd94ba9b5990a247d4156ec18bf6ea0eb [diff] |
am 704530ed: Merge "Add \'disabled\' state for when Gcam is unable to take another shot." into gb-ub-photos-carlsbad * commit '704530edd94ba9b5990a247d4156ec18bf6ea0eb': Add 'disabled' state for when Gcam is unable to take another shot.