tree 575330b08e48bef9f7298ee85aa5d62d337187da
parent 4c737496142085a7354e6aa663c09b5dd5a83633
parent d4544b75f108f373e32f9c98b3d3c12539064c94
author David Christie <dnchrist@google.com> 1376358281 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1376358282 +0000

Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and network providers." into klp-dev