OSDN Git Service

am fd5ec09f: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
authorJorim Jaggi <jjaggi@google.com>
Wed, 27 May 2015 20:23:39 +0000 (20:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 20:23:39 +0000 (20:23 +0000)
commit30ddbcdb680d1ace092fe8e377542a0f6dfc8436
tree5c62d9356ad390c302471421885297aded3b13a8
parent41b0e87d9af7740053b42f7580bf3a1a9a7a6016
parentfd5ec09fe2152c67dc0b529803abc8f5f25f6b7c
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