tree 6422eb909935e6637059a9e8a28b924e0942d48e
parent 402bcf77d2870837d271b6b1cceb0942be152a6d
parent 2c160c1a64a696dcb6261311ca0a406a07231d33
author destradaa <destradaa@google.com> 1430332458 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430332458 +0000

am 2c160c1a: am bdf9ffdd: am c0667853: Merge "Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206" into mnc-dev

* commit '2c160c1a64a696dcb6261311ca0a406a07231d33':
  Add SystemApis in GpsMeasurements APIs to reflect changes in GPS HAL. b/19938206