commit | e0493a4af57c1a73376a7bafaed542c01f588196 | [log] [tgz] |
---|---|---|
author | Eric Li <ericli@chromium.org> | Mon Nov 15 13:05:43 2010 -0800 |
committer | Eric Li <ericli@chromium.org> | Mon Nov 15 13:05:43 2010 -0800 |
tree | 53f65893465f14c2be859b9889ea33924bd79fcd | |
parent | c18e883438c6c73d13a7ffbedb75ad881d06228a [diff] |
Merge remote branch 'cros/upstream' into tempbranch BUG= TEST= Review URL: http://codereview.chromium.org/4823005 Change-Id: I5d56f1c10d0fce7f9d7dc3ad727ea52dcb9b2d6c