app_Settings

Go to file

Jorim Jaggi 30ddbcdb68 am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev

* commit 'fd5ec09fe2152c67dc0b529803abc8f5f25f6b7c':
  Cancel enrollment when navigating out of enrollment
  String changes for app links in settings
  Remove data item from app info when not supported
  Monkey should not be allowed to switch USB mode

2015-05-27 20:23:39 +00:00

res

am 4ae8b37c: Merge "Fix transient Next button in confirm screen on orientation change" into mnc-dev

2015-05-27 16:07:55 +00:00

src/com/android/settings

Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev

2015-05-27 18:33:26 +00:00

tests

am b5c48a4c: Merge "VPN: UI for forgetting disconnected VPNs" into mnc-dev

2015-05-19 10:25:58 +00:00

Android.mk

Allow incremental builds for settings.