| commit | 1c2e91c1b7edc6af9ac26d6d1e08d5cb80efdd1e | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:54:12 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:54:12 2013 -0800 |
| tree | ae83441f974f7557bf724516dd58c6d86aeb5379 | |
| parent | 469df524920146cb697842abc53b4474167bf1eb [diff] | |
| parent | 85f18a15b1375c4d59b93f4dac1d4b5995854fe6 [diff] |
am 85f18a15: (-s ours) am 2d3c3e14: Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE * commit '85f18a15b1375c4d59b93f4dac1d4b5995854fe6': Camera2: Tests: Fix Camera2Test to be correct: DO NOT MERGE