| commit | a4a88050483581918304bc777e9636563a96cc2e | [log] [tgz] |
|---|---|---|
| author | Lance Jin-woong Chang <jinwoong@google.com> | Thu Aug 06 05:11:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 05:11:32 2015 +0000 |
| tree | 3a9deab6eb2462741a185e3626bf1a6469fe0ec4 | |
| parent | e9f6c68d23cda9ae5d96822337aa4813991c5e4b [diff] | |
| parent | b3bb1f3ecf94e74b762158d17b0269662657c03a [diff] |
am b3bb1f3e: am 9accf44a: am c38471f0: am d8f16bb6: Merge "Camera: Increase timeout for long-running test." into lollipop-mr1-cts-dev * commit 'b3bb1f3ecf94e74b762158d17b0269662657c03a': Camera: Increase timeout for long-running test.