| commit | 8daec257bfe3575d008189df0a945a1ba2238cfa | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Wed Aug 27 21:39:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 21:39:49 2014 +0000 |
| tree | a587b8742f5ef0191bf3fcc84aef5b88cfb6a61f | |
| parent | e9e8eedb57e9b2f96bbf92f040d7d398cbfe49d9 [diff] | |
| parent | 969d606acb2b2f6e755f9164348712306dc7b557 [diff] |
am 969d606a: Merge "Make sure CaptureModule (and therefore Gcam) always resumes right." into ub-camera-glacier * commit '969d606acb2b2f6e755f9164348712306dc7b557': Make sure CaptureModule (and therefore Gcam) always resumes right.