| 6f27d4f22a1ba5063968b8c322fa0845f3279ade |
|
29-Sep-2010 |
Eric Li <ericli@chromium.org> |
Merge remote branch 'cros/upstream' into tempbranch3
Merge to trunk@4817
BUG=
TEST=
Review URL: http://codereview.chromium.org/3554003
Change-Id: I83376bc7d28104ec2678e157eadbe7df7c05c0e0
/external/autotest/frontend/client/src/autotest/afe/ControlTypeSelectDisplay.java
|
| 517d95a1ef4edb04da427763f86068a447d45ec7 |
|
29-Sep-2010 |
Benson Leung <bleung@chromium.org> |
Revert "Merge remote branch 'cros/upstream' into tempbranch2"
This reverts commit 25fc6d1f28e54c46689f12d3b93c2540ef45323a.
TBR=ericli@chromium.org
Review URL: http://codereview.chromium.org/3541002
Change-Id: Ib0165b19bfdf02264f8a6a74ddf3ae74c8c0f7df
/external/autotest/frontend/client/src/autotest/afe/ControlTypeSelectDisplay.java
|
| 25fc6d1f28e54c46689f12d3b93c2540ef45323a |
|
29-Sep-2010 |
Eric Li <ericli@chromium.org> |
Merge remote branch 'cros/upstream' into tempbranch2
Merged to trunk@4816.
BUG=
TEST=we will build a new autotest server instance, and keep cautotest running and then later do a cname switch.
Review URL: http://codereview.chromium.org/3511003
Change-Id: Iee5f52f45f28f84927d6c6f9a74edc370d40288a
/external/autotest/frontend/client/src/autotest/afe/ControlTypeSelectDisplay.java
|