tree b606a2f557447a1374faf12f6fea91a56129e6be
parent e09cbb8bbf31d0f00864faf3380717ecb036e684
parent dca07572d977a0c3e691494c4dba136cc4b9d97e
author Wei Wang <weiwa@google.com> 1492647822 +0000
committer android-build-merger <android-build-merger@google.com> 1492647822 +0000

Merge "Add a wakelock timeout when downloading xtra data for GNSS." into oc-dev am: b1f7358d98
am: dca07572d9

Change-Id: I81e91999c4a289caceea2407f62ef417c4b71072