commit | 000ecdd3f5e38c8135cfc3caffea2327c668fbc1 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Tue Sep 17 09:02:07 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 17 09:02:07 2013 -0700 |
tree | fd5002ff721de68be9efdba391c460786e5ddecc | |
parent | 2c0d90a67e445ab728a51f64fca9b7e74ef74397 [diff] | |
parent | 6484c42eb44bfe8fc8d2972bfc564b96f0f7f16c [diff] |
am 6484c42e: am 33caca5c: Merge "Add a feature to specify if device admins are supported on the device" into klp-dev * commit '6484c42eb44bfe8fc8d2972bfc564b96f0f7f16c': Add a feature to specify if device admins are supported on the device