app_Settings

Go to file

Hyunyoung Song 0e9f297027 Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev

am: 6f2771623f

* commit '6f2771623f3a93d51ad075c476ca9b538c0d44e6':
  Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771.

Change-Id: I04623fcec7e8046c7a5e905e09261d5c9e550018

2016-05-10 17:30:20 +00:00

res

Merge "Show a different Root CA string for device owner" into nyc-dev am: 9c31684bbe

2016-05-10 14:42:47 +00:00

src/com/android/settings

Merge "Revert "Add shortcut manager support to Settings (2/2) b/28298258" b/28643184 This reverts commit 79ec6df771b0c05609a611a939f08fcd51f45b74." into nyc-mr1-dev

2016-05-10 17:30:20 +00:00

tests

Merge "Add a deletion helper view for clearing space." into nyc-mr1-dev

2016-04-21 17:27:16 +00:00

Android.mk

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

AndroidManifest.xml

Merge "Default payment settings to disabled" into nyc-dev am: 6b421dd

2016-04-28 13:02:51 +00:00

CleanSpec.mk

CleanSpec!

2015-04-13 09:21:39 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Create feature factory interface & initial impl.

2016-04-19 23:01:49 +00:00

wrap_alpha.py

Wrap tintable icons with correctly tinted drawable XML

2015-04-10 15:46:18 -07:00