| commit | 1a5711976652603d2b1964be651facaffdac2b9b | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Sat Sep 12 06:29:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 06:29:10 2015 +0000 |
| tree | 807cd8c5c3f994149c409e145d2eeeeb01f87f96 | |
| parent | 33329d2ac7d3ba798f87d63611a9d7e5200b5e19 [diff] | |
| parent | 25a380e39decb17e1d360e6225cc6510d9f88cb7 [diff] |
am 25a380e3: resolved conflicts for 5bc69858 to lmp-dev * commit '25a380e39decb17e1d360e6225cc6510d9f88cb7': Use Supported Camera resolution.