| commit | 1bb6dd43488cacd73c642333a5cd80c843d9e3fb | [log] [tgz] |
|---|---|---|
| author | blossom_chiang <blossom_chiang@htc.com> | Tue Jun 20 07:29:21 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jun 20 07:29:21 2017 +0000 |
| tree | df06a7f7b82fc6654ece0c4ecccb5e21323c4383 | |
| parent | 113039558c6900a7abc8869cf3b4bc496a97f0bd [diff] | |
| parent | 8c20461b3bccf26b617b9587095bc4d85afa5a80 [diff] |
Merge "Merge "Test: CameraCTSTest-Extend camera test timeout from 40min to 60min." into nougat-mr1-cts-dev am: 478c78fa27" am: 6b3eb49f74 am: 268e48be2c am: 0e08f99a02 am: 8c20461b3b Change-Id: I1375ad5d7e35215081cfc2e14b7587da829c548b