| commit | 93d9033245268ecc3d97bd4bfa03fd3f9d7d43d5 | [log] [tgz] |
|---|---|---|
| author | Ben Chan <benchan@chromium.org> | Thu Jun 20 07:20:13 2013 |
| committer | Ben Chan <benchan@chromium.org> | Thu Jun 20 07:20:13 2013 |
| tree | 190840e619e467bf42fe0b9cd772a13ece6e3705 | |
| parent | 2bb0562eca464049df2cc7fefdcd171e428f1ea9 [diff] | |
| parent | eaf82e5f14099dc16a3b83bac888f9612fe99bea [diff] |
Merge remote-tracking branch 'cros/upstream' into 'cros/master' BUG=none TEST=xmllint --valid --noout serviceproviders.xml TEST=run unit tests Change-Id: Ief254c0124337da188fca3f2bb01609782e7c53d