commit 861b2d54aec24228cdb3895dbc40062cb40cb2ad
author Eric Li <ericli@chromium.org> Fri Feb 04 14:50:35 2011 -0800
committer Eric Li <ericli@chromium.org> Fri Feb 04 14:50:35 2011 -0800
tree 98e6baca82ac8b04977cb844cee9ef48cc8a98ea
parent 216e4ffd6529a21ad5c09bcfe79d6d2dcdf09fd0

Merge remote branch 'cros/upstream' into master

Merged to upstream autotest @4749~@5215.

The entire change list description is too big to enlist here. Please refer to upstream (http://autotest.kernel.org/browser) for more details.

BUG=
TEST=emerged both x86 and arm build.
Tested emerged x86 build bvt against a chromeos device.

Review URL: http://codereview.chromium.org/6246035

Change-Id: I8455f2135c87c321c6efc232e2869dc8f675395e