commit | a411b5d43b13ffa4f6a09d9ace5f2964ba7a144d | [log] [tgz] |
---|---|---|
author | Ben Chan <benchan@chromium.org> | Sat Sep 14 00:42:29 2013 |
committer | Ben Chan <benchan@chromium.org> | Sat Sep 14 00:42:29 2013 |
tree | 14a4f52cb52c6102ee9051eb94450fc49517ba80 | |
parent | 1c050a50f78fab1ea824036dc50f465cb9d4a7ae [diff] | |
parent | c3755714b7147c531a16a63754ff6dbbcd46006c [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master' BUG=none TEST=xmllint --valid --noout serviceproviders.xml TEST=Run unit tests