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