| commit | d22a6677312d17d23da3b655a2e9b12533dfff76 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 27 03:08:01 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 27 03:08:02 2014 +0000 |
| tree | 876b95718ae8a5a58bc4aabfc3b4dc42d494f7cc | |
| parent | 6c79454cfc59c07af94289faceb87598aa570616 [diff] | |
| parent | 76b9b8b0ca537bad6c4da388d77a9e5dee023856 [diff] |
Merge "Limit grantTrust() duration to DevicePolicy-imposed limit." into lmp-dev