Commits
Wei Liu authored and Android Git Automerger committed 09a3f034e58M
am aa13c26b: am 8c8e335b: am b9599750: Merge "resolved conflicts for merge of f0c4f0dd to mnc-dev" into mnc-dev * commit 'aa13c26ba1eb789d5e81ae04bd4631d90311a309': Create GpsLocationProvider only if GPS is supported.
Showing diff to8401c3620d0