| commit | bdc2da026f3f9b8c461c9ed03566d5f182f6dd01 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 27 04:46:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 27 04:46:25 2014 +0000 |
| tree | 3df471572b1244effd3de0bbae41354a93323bfc | |
| parent | b35b627173d0294c2c3a812c53cf22d23712b831 [diff] | |
| parent | c047a9511691f5c093f7b9471800eb72c560085e [diff] |
am b0400d12: am 771ad8b7: Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev * commit 'b0400d12f8f2dd4ad8088fef9c13dcf37bcb9837': Limit grantTrust() duration to DevicePolicy-imposed limit.