| commit | b52c7ae862bb5e990ca6447e02833c2b5eba78fb | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Aug 27 21:26:14 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 27 21:26:14 2014 +0000 |
| tree | f4eae686d4d3d31e0ce157143aec2fccc8d9e75b | |
| parent | 016fc167aca1f31aa0b151e1312408fcaa9bf9b6 [diff] | |
| parent | ac48e8f5e350657b77681d903933372a579ed571 [diff] |
Merge "Revert "Add test options for DPM.setTrustAgentFeaturesEnabled()" until the new API is ready. This reverts commit d6df7362ab4b332a09d12358297056cfeadcaa11." into lmp-dev