| commit | 36228259d4f080cbafca7e03e812bcbd60e262dc | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Feb 16 22:21:20 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 16 22:21:20 2016 +0000 |
| tree | 4172fb7363b5ba91442962021e8623d0cf5ab971 | |
| parent | 7b4269b679bbad5ee20c2f5abea70c0903f1290b [diff] | |
| parent | d45b3c6779751087dd30718871fcce1eb1944883 [diff] |
Merge "Camera : Increase timeout for long-running test." into marshmallow-cts-dev am: 7a74ea4e7b am: b8b0b5e54c am: d45b3c6779 * commit 'd45b3c6779751087dd30718871fcce1eb1944883': Camera : Increase timeout for long-running test.