tree 6760d20858e38f57ca94a6b3ee19d5a95ad31448
parent 5dbaee64d498766a0c261b7c820b4f134d49f42c
parent 677ddbba2697805979dcd1480132535af6c3a3ad
author Brian Muramatsu <btmura@android.com> 1305139191 -0700
committer Android Code Review <code-review@android.com> 1305139191 -0700

Merge "enlarge timeout for android.hardware.cts.CameraTest#testPreviewPictureSizesCombination. Some device will support too many counts of preview sizes to finish test in time." into gingerbread