Skip to content
Commit 231e2474 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Merge commit 'c3069c26' into manualmerge 

Conflicts:
	docs/html/guide/topics/location/strategies.jd

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
parents 260f110f c3069c26
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment