| commit | b021eec56796d112c7dda4ef9668f31dff84198d | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Mon Jan 13 23:04:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 13 23:04:18 2014 +0000 |
| tree | 8a8fc75747a5cf7df5c11ff1600baf6a2c6059af | |
| parent | 1f20a23e759549d77f64a0b2c9ba5e39ef2690db [diff] | |
| parent | a82e1b8799351e42111a75921eb6aacdb16134f9 [diff] |
am a82e1b87: am 68ac1f1e: Merge "Docs: Adding note about CtsDeviceAdminDeactivated Bug: 12084920" * commit 'a82e1b8799351e42111a75921eb6aacdb16134f9':