| commit | 231e2474f283dc0a1962b45f1c16c5280a8937df | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed May 15 07:30:11 2013 -0700 |
| committer | Dirk Dougherty <ddougherty@google.com> | Wed May 15 07:30:11 2013 -0700 |
| tree | 9821cfab9d69efcd2024b007027c3bf0ee07f0b3 | |
| parent | 260f110fce5374fa2c4b2d1788a54b1fa5a04d0f [diff] | |
| parent | c3069c2614c76ad74c5b947126fc2037b9e7b61b [diff] |
Merge commit 'c3069c26' into manualmerge Conflicts: docs/html/guide/topics/location/strategies.jd Change-Id: If38621ee5e6266fb3a68aff710553dc68d07eb5b