| commit | b3c7ad328d0a9467ed3864a84ed822720e970334 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Wed Apr 29 01:44:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 01:44:50 2015 +0000 |
| tree | c3cea45dffbef0fbd71ae5496c90f8357fbdbc87 | |
| parent | 7374dc3547128ed6330c9fbd99fc84e56ce97513 [diff] | |
| parent | 7c97a3ddea62a3bd8a95ca51e7b172b209388815 [diff] |
am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev * commit '7c97a3ddea62a3bd8a95ca51e7b172b209388815': Permissions control via profile/device owner admin