commit | 5b424092654f145e479bcfdc57d4e634a2c45c8e | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Fri Mar 20 21:14:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 21:14:24 2015 +0000 |
tree | 5b739588a09df837f67b0b01285c93cba08cf411 | |
parent | efbbe21b741d8bc4226374369c10d28cd06430ec [diff] | |
parent | 646ce9d2bfe1e1d287b41cbfb9d77cdbfd708f5c [diff] |
am 646ce9d2: am 7d3377ce: Merge "Camera2: update still capture template requirement" * commit '646ce9d2bfe1e1d287b41cbfb9d77cdbfd708f5c':