OSDN Git Service

Merge commit 'c3069c26' into manualmerge
authorDirk Dougherty <ddougherty@google.com>
Wed, 15 May 2013 14:30:11 +0000 (07:30 -0700)
committerDirk Dougherty <ddougherty@google.com>
Wed, 15 May 2013 14:30:11 +0000 (07:30 -0700)
commit231e2474f283dc0a1962b45f1c16c5280a8937df
tree9821cfab9d69efcd2024b007027c3bf0ee07f0b3
parent260f110fce5374fa2c4b2d1788a54b1fa5a04d0f
parentc3069c2614c76ad74c5b947126fc2037b9e7b61b
Merge commit 'c3069c26' into manualmerge

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

Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b
docs/html/google/play-services/location.jd