| commit | fe522bdeb69d67b9c83b61b48684aadec4c85d53 | [log] [tgz] |
|---|---|---|
| author | Zhijun He <zhijunhe@google.com> | Thu Apr 10 02:13:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 10 02:13:15 2014 +0000 |
| tree | 1114750529d010331e6eb020b3f6d1fe9dc198f9 | |
| parent | 13c630a695dd5d0311993f2c72002e85f9a3a6eb [diff] | |
| parent | 9ce83761cc9908e6acad8af5ad45574163b28b19 [diff] |
am 9ce83761: Merge "Camera2: Add MANUAL capture intent" * commit '9ce83761cc9908e6acad8af5ad45574163b28b19': Camera2: Add MANUAL capture intent