commit | a01c1f0d90def31de9bdd21bada11a3dfc0444b0 | [log] [tgz] |
---|---|---|
author | Tony Mak <tonymak@google.com> | Wed Apr 06 18:39:20 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 06 18:39:21 2016 +0000 |
tree | 1106a6ad34a7e3eaf2d6dc94a310e428e7c64791 | |
parent | 8da25ef74afaa63e1ba2814f219c0d0bac2abf7e [diff] | |
parent | 089d840383c511ed170a284ba343bd9a00db790e [diff] |
Merge "xxxTrustAgentConfiguration should be supported in the parent DPM instance" into nyc-dev