commit | 54be1ea752b5d04d914e3c03b61fbfb3ef6b4287 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Wed Oct 15 17:48:50 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 17:48:50 2014 +0000 |
tree | 1efe914b543f47b58366b04e4e33abf814e118ea | |
parent | 60d53ebedbe4c84a143aaba4a6e26af2cab60fec [diff] | |
parent | 2c3886cb3463ff39c1986c5b85eba79748dd8c24 [diff] |
am 2c3886cb: Merge "Fix admin policies in managed profiles" into lmp-dev * commit '2c3886cb3463ff39c1986c5b85eba79748dd8c24': Fix admin policies in managed profiles