tree 7598d3104624e8c17b7c9ae4c22adec34008dac3
parent b997412aafbe2c49e2172ddb9c5d558d08297f16
parent 294d99843aed68db5e3234a701aa7b338ddf12bd
author Ben Chan <benchan@chromium.org> 1406056610 -0700
committer Ben Chan <benchan@chromium.org> 1406056610 -0700

Merge remote-tracking branch 'cros/upstream' into 'cros/master'