| commit | 0ea714a9d1b8c78000d993767c971aa45290f0f6 | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Wed Sep 05 00:56:14 2012 |
| committer | Ben Chan <benchan@chromium.org> | Wed Sep 05 00:56:14 2012 |
| tree | b15f427b16588e963a8697b5e69a2a36b97946af | |
| parent | 289055e6c1bd887fd5e08ccc8508952183931a0a [diff] | |
| parent | b8d4c6de3c3fcf40e10a2b05ec38779719e51673 [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master' BUG=chromium-os:25493 TEST=xmllint --valid --noout serviceproviders.xml TEST=run unit tests Change-Id: Ie7a1b58cc9080b56d77c553d6b32e82d5652befa