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