commit | 4bfa55d4c232d2c55b5ffabd2e1ec856d4ef5a89 | [log] [tgz] |
---|---|---|
author | Clara Bayarri <clarabayarri@google.com> | Fri Jan 15 16:00:45 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 15 16:00:45 2016 +0000 |
tree | a743d39db554bb5d98a4013adc351c6f061a4aab | |
parent | 6dfcf14a2f6248e2ecdd5af8e11c13530b3a7597 [diff] | |
parent | 00a9b890853e9660dde5854fe786b80f6c3e616c [diff] |
Merge "Protect TrustManager.setDeviceLockedForUser with permission"