| commit | 2ad2810910ebcfab057b253d7f2d635605d1baba | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Mon Sep 21 21:42:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 21 21:42:54 2015 +0000 |
| tree | 6e07216839149041235733be2218067833baab58 | |
| parent | ce43fc904008b1af44fa806a96b863b4aa4eccd5 [diff] | |
| parent | 3f7eeed2db39b516eb52e9545aaa49ea87405633 [diff] |
am 3f7eeed2: am dbdeb0fb: (-s ours) Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours * commit '3f7eeed2db39b516eb52e9545aaa49ea87405633':