Joe Onorato b686b03272 Merge changes Ib6e0e6f3,I109f04c2,Idc716000,I44c51d5f,I810b9bd5, ... into nyc-dev am: 5d4ab988bd ...

am: 15e93f3715

* commit '15e93f3715742d0ffad6089cf804842f2e5f393b':
  Turn down the logging a little bit.
  Turn down the logging a little bit and don't do a log wrapper function.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.
  Turn down the logging a little bit.

2016-03-04 21:53:06 +00:00

..

res

Merge "Update restricted icon." into nyc-dev am: 5f4defc61d

2016-03-03 18:37:02 +00:00

src/com/android/settingslib

Turn down the logging a little bit.

2016-03-04 12:21:30 -08:00

tests

SettingsLib: Fix wifi crash during settings index

2015-05-22 11:26:34 -04:00

Android.mk

Move restricted padlock support to SettingsLib

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

AndroidManifest.xml

Add uses-sdk to reduce red squigglies

2015-06-08 15:46:51 -07:00

common.mk

…