| commit | 5b9a5fef6d9d74a09470042b9690d63830417b28 | [log] [tgz] |
|---|---|---|
| author | Amith Yamasani <yamasani@google.com> | Wed Apr 29 02:00:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 02:00:50 2015 +0000 |
| tree | d98ea2eae47a87c6d9a2bc3accdfe55cf7d4b890 | |
| parent | 150235b28a036287b3ce80bb2d65ab6af569f855 [diff] | |
| parent | b3c7ad328d0a9467ed3864a84ed822720e970334 [diff] |
am b3c7ad32: am 7c97a3dd: Merge "Permissions control via profile/device owner admin" into mnc-dev * commit 'b3c7ad328d0a9467ed3864a84ed822720e970334': Permissions control via profile/device owner admin