| commit | 14aa089adeff08ddf912d51c02f69b88ccc5e6be | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Fri Jun 28 07:13:07 2013 |
| committer | Ben Chan <benchan@chromium.org> | Fri Jun 28 07:13:07 2013 |
| tree | ed8c117ea751d79c068076ee7019894941fac922 | |
| parent | 87c4231f7accd7a2f9d110410a7184b2ba18c4de [diff] | |
| parent | 0092f2438b934371d084f9ed34794c875e0e38d4 [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master' Change-Id: I177e94c7eff938fcc21b366031234126cda480b5