commit | 878b51dffe5d4f59277adb66a3cc2fc4f02c763c | [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 | 0ce5ffaf47277e1211d4cc82c7237f7152b19907 | |
parent | b3f45ec3ed96e4f037a1a6c835a68a98b2823a25 [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.