| commit | 6ebe3a6ea26178956fd5e6c6bc7ab5daa4df335d | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Sun Nov 02 19:02:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:02:34 2014 +0000 |
| tree | 175f5f05ef6d3038efb9b1051b7d02767d99dd38 | |
| parent | bad4e4694eb6e8cd42fc2cb7fa5c149f16bc61e9 [diff] | |
| parent | 036d581c8ceea984f2eeedbdfb6246c85b636708 [diff] |
am 036d581c: am 4e91ba99: am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev * commit '036d581c8ceea984f2eeedbdfb6246c85b636708': Don't allow disabling of the camera with managed profiles