tree 14a4f52cb52c6102ee9051eb94450fc49517ba80
parent 1c050a50f78fab1ea824036dc50f465cb9d4a7ae
parent c3755714b7147c531a16a63754ff6dbbcd46006c
author Ben Chan <benchan@chromium.org> 1379119349 -0700
committer Ben Chan <benchan@chromium.org> 1379119349 -0700

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

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