tree abf4f4d4009595d285ce16b9444fbb7834c85d2d
parent 9295f58d26126f69d7944c322cb03040d87ba4e2
parent 33676dddbdd37dc76c449e81ca8c5642f87a60c7
author Maggie Lee <mfylee@google.com> 1501598260 +0000
committer android-build-merger <android-build-merger@google.com> 1501598260 +0000

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

Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29