OSDN Git Service

resolved conflicts for merge of 3c8cf51f into stage-aosp-master
authorAndreas Gampe <agampe@google.com>
Wed, 29 Oct 2014 03:42:53 +0000 (20:42 -0700)
committerAndreas Gampe <agampe@google.com>
Wed, 29 Oct 2014 03:42:53 +0000 (20:42 -0700)
commitdfdc6acc4809f395b9db2136acc89b6de932a1a5
treec44ec16b92652caec8259db9e472fb6f77a480df
parent5d4deb8246b13531a6b2b7611c650ba504e44dc6
parent3c8cf51f86538e7c580c5574108be825ef00c534
resolved conflicts for merge of 3c8cf51f into stage-aosp-master

Change-Id: I507358be6186c4b8d1968cd4e370afe9fd1a02eb
services/core/java/com/android/server/location/GpsLocationProvider.java
services/core/java/com/android/server/location/GpsXtraDownloader.java