am 21f62b9e: Merge "Add a method enable encryption." into honeycomb

* commit '21f62b9e461416ae61c8471f7199f104f8fe33de':
  Add a method enable encryption.
This commit is contained in:
Jason parks 2011-01-13 07:44:55 -08:00 committed by Android Git Automerger
commit 7180ea8aec

Diff Content Not Available