OSDN Git Service

resolve merge conflicts of a2399b4 to mnc-dev
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)
committerDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 20:47:57 +0000 (13:47 -0700)
commit6195acc2b55425bb7b0d00fcb9af374d90ee5af9
treec07cb168ffcc36d7a8322dbce8224c1aae53611d
parentb51e98becbca9c28e37d9806124ecebf6f8d7dd0
parenta2399b45e28fc1097e4a3b1d7d735241e29a3b4f
resolve merge conflicts of a2399b4 to mnc-dev

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