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