| commit | adc3a2825c754084728193ebf4f88b411e5b3dbc | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Jun 06 12:51:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 12:51:50 2013 -0700 |
| tree | 8abd882be94551b9e1b408398ca4be17423010ca | |
| parent | d63bd61ee862db18677276b1a18b2d7938a5e193 [diff] | |
| parent | 9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2 [diff] |
am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... * commit '9cd1d5e2c07248e9cc22721d9373ebf1fcf9dba2': Fix issue #9074296: Device Admins can activate in a way...