tree a3d9a2938c22d84d784d0ae94495327b45e25c95
parent 278da9df1e3bc018d0a8586c0060259ad2d37425
parent a038ff172b086181ba656a42529992e248ce940c
author Ben Chan <benchan@chromium.org> 1401807959 -0700
committer Ben Chan <benchan@chromium.org> 1401807959 -0700

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