| commit | 840f36895130e8be8c2e1c7445923de09b5eef01 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Fri Jun 03 16:35:16 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 03 16:35:16 2011 -0700 |
| tree | 35698ad7abd06b4aea43a1c408e5c49def4eb0ab | |
| parent | f32273ce7de9aa764858e5d3dce6ab83019fe8c6 [diff] | |
| parent | 14eda7256c58e435e9bfad2f0d45e1f6bd715d68 [diff] |
am 14eda725: (-s ours) am dfb979cd: am 7e408e8b: Merge "DO NOT MERGE Replacement sample code for DevicePolicyManager api." into honeycomb-mr2 * commit '14eda7256c58e435e9bfad2f0d45e1f6bd715d68': DO NOT MERGE Replacement sample code for DevicePolicyManager api.