commit | 7aa2530d7308da9259ba6d097e21844891a7f120 | [log] [tgz] |
---|---|---|
author | Ben Chan <benchan@chromium.org> | Sun Nov 23 20:29:57 2014 |
committer | Ben Chan <benchan@chromium.org> | Sun Nov 23 20:29:57 2014 |
tree | 31a409152db5fa1215281383b03ccda696448164 | |
parent | 4031dc495093ccd24b977df6b7be0f0c94ce9937 [diff] | |
parent | b51f701524778acde8ed33d3e4f1a2ac0f694f81 [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master'