commit | 6f27d4f22a1ba5063968b8c322fa0845f3279ade | [log] [tgz] |
---|---|---|
author | Eric Li <ericli@chromium.org> | Wed Sep 29 10:55:17 2010 -0700 |
committer | Eric Li <ericli@chromium.org> | Wed Sep 29 10:55:17 2010 -0700 |
tree | 005f0148aaf905741ae5f144918ffeee32194c56 | |
parent | 1e5db6ab5e1178224b02355bf8a6ee5762a6f477 [diff] |
Merge remote branch 'cros/upstream' into tempbranch3 Merge to trunk@4817 BUG= TEST= Review URL: http://codereview.chromium.org/3554003 Change-Id: I83376bc7d28104ec2678e157eadbe7df7c05c0e0