| commit | 40cdaccf673aec850816cdd1b535c5ab3a1f3bf7 | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Thu Dec 27 22:33:18 2012 |
| committer | Ben Chan <benchan@chromium.org> | Thu Dec 27 22:33:18 2012 |
| tree | 860a508ab8dba4e63abecc47b2d67b3b906f6301 | |
| parent | 959f6b15bfaee67c1ece7d8e7a033cecb6c5e449 [diff] | |
| parent | 1822155d250dc40436da9808b949310e8d9d2d82 [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master' Change-Id: Icd83ba97c5dcbf0aa09d9a364e6f3e582b3dc237