Jean-Baptiste Queru 65dd62a306 resolved conflicts for merge of ee27dd35 to master ...

Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7

2010-12-07 13:17:37 -08:00

..

android/location

…

com/android/internal/location

resolved conflicts for merge of 78742e01 to stage-korg-master

2010-12-07 12:51:49 -08:00