| commit | f750cdea06c72ef3fa78a07410fa742436d47bcd | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Jun 06 12:54:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 06 12:54:34 2013 -0700 |
| tree | 803b6b6657d6ea77433d6429289abf8aff0d9604 | |
| parent | f71f25dbd6d92f688dc4f9b6b76ef1c3cd6523db [diff] | |
| parent | adc3a2825c754084728193ebf4f88b411e5b3dbc [diff] |
am adc3a282: 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 'adc3a2825c754084728193ebf4f88b411e5b3dbc': Fix issue #9074296: Device Admins can activate in a way...