tree 2b1791de2807552c579df4107466e2f63744d091
parent 0c2046fdfdd24f6d80299aba87ccf9437b0e9d6c
parent 70855ebe2126c3f1c479ee5f20b8381f515de6b1
author Yin-Chia Yeh <yinchiayeh@google.com> 1414255791 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414255792 +0000

Merge "CameraCTS: relax previewFps test constraint" into lmp-dev