OSDN Git Service

resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
authorDavid Christie <dnchrist@google.com>
Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)
committerDavid Christie <dnchrist@google.com>
Tue, 23 Aug 2016 23:19:51 +0000 (16:19 -0700)
commita2399b45e28fc1097e4a3b1d7d735241e29a3b4f
tree3d4c714596a3204595ce5df0890fcff3094b4887
parentec986ac944caa60dbbf882c159564b772c0e95b0
parent1081a15fd469cc9fdc1d0f02fc44df537ce48289
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev

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