app_Settings

Go to file

The Android Open Source Project ee53d98c93 am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '302bd5c78a860081ce63d7faba9b20c7d9af4092':
  Don't show ApnEditor as a dialog
  Import translations. DO NOT MERGE
  Allow hidden apps to opt-out
  resolved conflicts for merge of 5d21820a to jb-mr2-dev
  Fix issue #9074296: Device Admins can activate in a way...
  Ensure all active Device Admins are listed.

2013-06-10 11:11:50 -07:00

res

wifi-display: change string to "In use" instead of "Busy"

2013-06-07 10:29:34 -07:00

src/com/android/settings

Merge "wifi-display: change string to "In use" instead of "Busy""

2013-06-07 19:20:16 +00:00

tests

Import translations. DO NOT MERGE

2013-05-08 11:07:07 -07:00

Android.mk

Add EventLog to report lock screen type