| commit | 2494aa7b0d23b7daceeee732930fbfc2b0496251 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Jul 15 01:28:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 01:28:20 2015 +0000 |
| tree | ee030e0d02b01bb95583eede9f8dccdb8eb2958e | |
| parent | 77558cb5ce244db48ebc1211fd437687ec20b13c [diff] | |
| parent | 5bc1d25c0962dd0e6fe00ba47c58c4737685fa42 [diff] |
am 5bc1d25c: am 6703fc92: am 2507dec3: am eb0ef89b: am 4967c3e7: Merge "Use Supported Camera resolution." into kitkat-cts-dev automerge: 628c43a -s ours automerge: dbdeb0f * commit '5bc1d25c0962dd0e6fe00ba47c58c4737685fa42': Use Supported Camera resolution.