From: Gilles Debunne <debunne@google.com>
Date: Tue, 21 Jun 2011 23:53:51 +0000 (-0700)
Subject: Merge "Split Location and Security settings."
X-Git-Tag: android-x86-4.4-r1~2355
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0eb603d0997bf2dac89bd0dc4321380f19661a86;p=android-x86%2Fpackages-apps-Settings.git

Merge "Split Location and Security settings."
---

0eb603d0997bf2dac89bd0dc4321380f19661a86