tree c3cea45dffbef0fbd71ae5496c90f8357fbdbc87
parent 7374dc3547128ed6330c9fbd99fc84e56ce97513
parent 7c97a3ddea62a3bd8a95ca51e7b172b209388815
author Amith Yamasani <yamasani@google.com> 1430271890 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430271890 +0000

am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev

* commit '7c97a3ddea62a3bd8a95ca51e7b172b209388815':
  Permissions control via profile/device owner admin