tree 3166bbef6024b8251f931d2a7511268013b25a7d
parent 65f8961d6138281df30f939b63e8ddcafba5cb56
parent c8ff8dc83ea5a5a16aadf92cab8b47768544b123
author Jason Glasgow <jglasgow@chromium.org> 1336092952 -0400
committer Jason Glasgow <jglasgow@chromium.org> 1336093241 -0400

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

Conflicts:
	serviceproviders.2.dtd
	serviceproviders.xml

Change-Id: Id3d34b8118e1f46c86d0d6771bf0bd17bc917c72