OSDN Git Service

am e46eea9e: am 6f8fb436: Add a setting to enable encryption.
authorJason parks <jparks@google.com>
Thu, 13 Jan 2011 23:44:33 +0000 (15:44 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 23:44:33 +0000 (15:44 -0800)
* commit 'e46eea9edabfba9f310dae2bdaa9aedc551cb1a8':
  Add a setting to enable encryption.


Trivial merge