am 2c12c708: Merge "Add internal plumbing to DPM for encryption" into honeycomb

* commit '2c12c708bfb62464e75dcde292547b2d778dafce':
  Add internal plumbing to DPM for encryption
This commit is contained in:
Andy Stadler 2011-01-17 12:54:17 -08:00 committed by Android Git Automerger
commit 00b97efd47

Diff Content Not Available