OSDN Git Service

am 21f62b9e: Merge "Add a method enable encryption." into honeycomb
authorJason parks <jparks@google.com>
Thu, 13 Jan 2011 15:44:55 +0000 (07:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 15:44:55 +0000 (07:44 -0800)
commit7180ea8aecc26322d9561551dd0ec5c83e4eca46
treeaed8e574d7e34e5ee80ad8389d32885ef650ffbd
parent2b851f3dc0c043a1f4f65a528c0506a28f045bcf
parent5bf379e5b6dccb81a8b3780cacf52f834ab3df79
am 21f62b9e: Merge "Add a method enable encryption." into honeycomb

* commit '21f62b9e461416ae61c8471f7199f104f8fe33de':
  Add a method enable encryption.