OSDN Git Service

resolved conflicts for merge of f0c4f0dd to mnc-dev
authorWei Liu <luciferleo@google.com>
Wed, 13 May 2015 16:57:33 +0000 (09:57 -0700)
committerWei Liu <luciferleo@google.com>
Wed, 13 May 2015 16:57:33 +0000 (09:57 -0700)
commit8e4799ad456c972cc340d3f484afd69b2f14a761
tree99728cc25c3b709c0300968fcf9f41e5f09bf952
parent75e7d7eb0e5dd0ffd3ebc234e10d885d1366281a
parentf0c4f0ddb6167bac5f40b1f68044ecbf8486db7c
resolved conflicts for merge of f0c4f0dd to mnc-dev

Change-Id: I16df088016c010aa25ee73ea8e68b3db8c0449e3
services/core/java/com/android/server/LocationManagerService.java
services/core/java/com/android/server/location/GpsLocationProvider.java