Dirk Dougherty 231e2474f2 Merge commit 'c3069c26' into manualmerge
Conflicts:
	docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
2013-05-15 07:30:11 -07:00
..
2013-05-13 11:57:51 -07:00