From: Maggie Lee <mfylee@google.com>
Date: Tue, 1 Aug 2017 14:47:57 +0000 (+0000)
Subject: Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
X-Git-Tag: android-x86-8.1-r1~88^2~1^2^2~32
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d88f4b723d3d26020d3cfa811203f9183aa5e1b0;p=android-x86%2Fframeworks-base.git

Merge "power: gps: add gps read timeout" into cw-f-dev am: 33676dddbd
am: b5da08a276

Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
---

d88f4b723d3d26020d3cfa811203f9183aa5e1b0