tree 38ccf6ea3992ab774f5bda4ba021b08a7e02b7e8
parent 769aef475caeddaa74a6ab42d59a91778e1f8cae
parent 3f67a3cb5cebdd3d1c7a90c07ee23f4829e8e33a
author Ben Chan <benchan@chromium.org> 1392395377 -0800
committer Ben Chan <benchan@chromium.org> 1392395377 -0800

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

BUG=none
TEST=xmllint --valid --noout serviceproviders.xml
TEST=run unit tests