OSDN Git Service

resolve merge conflicts of b4a5615 to lmp-dev
authorDavid Christie <dnchrist@google.com>
Thu, 11 Aug 2016 20:06:08 +0000 (13:06 -0700)
committerDavid Christie <dnchrist@google.com>
Thu, 11 Aug 2016 20:06:08 +0000 (13:06 -0700)
commit288166cbb2c44a9a287f29c87fb59477f6df151e
tree500d1f3375e89830ec6d7bbc54fff807d6dce249
parent124cc534f8adc57c7f6d444b6cb0c6a2654068ab
parentb4a561541614567dcc8fec4ea87e2c05a347375f
resolve merge conflicts of b4a5615 to lmp-dev

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