| commit | d05b32c5d7f3dd8fc086b5874b15bfa1b0201426 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:54:10 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:54:10 2013 -0800 |
| tree | ae83441f974f7557bf724516dd58c6d86aeb5379 | |
| parent | c33274129a538c1e7455b9cd2a14f3cccffd1457 [diff] | |
| parent | e5326c296fe91b7ae7d43d00def34d22dc8e5771 [diff] |
am e5326c29: (-s ours) am 1f51808a: Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE * commit 'e5326c296fe91b7ae7d43d00def34d22dc8e5771': Camera2: Tests: Fix CameraFrameTests to pass instead of failing and hanging.: DO NOT MERGE