Dianne Hackborn e746f03c6c resolved conflicts for merge of 53686433 to master ...

Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d

2010-09-13 16:56:10 -07:00

..

android/location

resolved conflicts for merge of 53686433 to master

2010-09-13 16:56:10 -07:00

com/android/internal/location

New Location Manager APIs for Criteria based requests and single shot mode.

2010-05-21 11:47:19 -04:00