OSDN Git Service

resolved conflicts for merge of 78742e01 to stage-korg-master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 20:47:12 +0000 (12:47 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 20:51:49 +0000 (12:51 -0800)
commit12902d687fa1bd4bff3c2dfc079c71eacb00eedd
treeaa62ab756e61c52df8e02a1ba559da35b04fda11
parent1ee2394edd4b90111f8174862c7c0f435e1a3634
parent78742e01f73d098076f55cf4f40f0a013a3d88ce
resolved conflicts for merge of 78742e01 to stage-korg-master

Change-Id: I0ce429afeb26184f075b4ed326fc4e1c0833e905
core/res/res/values/strings.xml
location/java/com/android/internal/location/GpsNetInitiatedHandler.java