tree affead1019c1b8ad6a1a2c14fc62839e45240d87
parent 6ca2e49f1b1be51ba3693f5c2137bc1e7715ba63
parent 7bd5f9d01e41dde9657419fd12916a2c1e0fe642
author Tsuwei Chen <tsuwei@google.com> 1409766830 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409766831 +0000

Merge "Adds carrier-specific GPS parameters. Bug: 17288144 Change-Id: Ibafef473221385b304f2ef77df7d9862b348cdf7" into lmp-dev