| commit | 0e397d3adb9b3732e58b5bc9d6663420c7fb52cd | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Fri Jan 11 10:54:08 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 11 10:54:08 2013 -0800 |
| tree | ae83441f974f7557bf724516dd58c6d86aeb5379 | |
| parent | 02b7d5ee72ec7746c8c778fc53bfdae4b1274961 [diff] | |
| parent | be3b59c46e1fd6050bcc743202fcd6d109125701 [diff] |
am be3b59c4: (-s ours) am ff4d762c: Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE * commit 'be3b59c46e1fd6050bcc743202fcd6d109125701': Camera2: Tests: Add CLI arguments for disabling forking and changing camera ID: DO NOT MERGE