| commit | da610e1beae4b5346133cefa8e01643856bd4856 | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Fri Feb 22 05:45:13 2013 |
| committer | Ben Chan <benchan@chromium.org> | Fri Feb 22 05:45:13 2013 |
| tree | e509cd19818247425490e52b127180275f2251ec | |
| parent | 0ea1424b1c05a992baafb1cf8ba5d2dbcdc5e51a [diff] | |
| parent | 096bd09c79a7680893b506e1e1f63a918595f930 [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: If120eae6fe82438f014025140fe7dcfcfdd2f8a4