Jason Monk 7bd0882a7a Merge "Fix Settings home lifecycle" into nyc-dev ...

am: a2e759d

* commit 'a2e759d963e2b75775bb3708039f687d57920998':
  Fix Settings home lifecycle

2016-03-17 18:01:54 +00:00

..

res

Merge "Change wording of WebView Implementation invalid-choice Toast." into nyc-dev

2016-03-17 18:01:42 +00:00

src/com/android/settingslib

Merge "Fix Settings home lifecycle" into nyc-dev

2016-03-17 13:32:20 +00:00

tests

…

Android.mk

Move restricted padlock support to SettingsLib

2016-01-12 18:14:24 +00:00

AndroidManifest.xml

…

common.mk

…