app_Settings

Go to file

Ed Heyl 18997d9eed am bc6aa63a: am 5af7e568: am 67390aad: merge in klp-release (no-op)

* commit 'bc6aa63a1afe5f50c3d03d8241f48cc4f6320c2e':
  updated launcher settings icon to gray gear
  Load account type icons in a background thread before scrolling down
  Updated de-blued backgrounds for settings power widget.
  Add print job settings screen.

2013-10-16 18:02:13 -07:00

res

Resolved conflicts for merge of 67e72aa4 to master

2013-10-15 13:37:35 +01:00

src/com/android/settings

am 06c0a90d: am a31d8b71: am 235e5d68: User ID, not uid, in an EXTRA_USER_HANDLE

2013-10-16 13:46:45 -07:00

tests

Import translations. DO NOT MERGE

2013-09-14 21:12:30 -07:00

Android.mk

The Settings app needs privileged permissions