commit | 5c8cafa6143858f725dd1bb73da7ac9f8d8f8f5f | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Wed Oct 15 17:54:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 17:54:34 2014 +0000 |
tree | b5c4febc9ce31c0571cd9539c0beda002a4f9c89 | |
parent | 2df76285914692973a4dfa6d600a71584e3e1c2a [diff] | |
parent | 01ddc75fc1e9ea28212512299132e9bdace60e05 [diff] |
am 01ddc75f: am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev * commit '01ddc75fc1e9ea28212512299132e9bdace60e05': Fix admin policies in managed profiles