OSDN Git Service

am a13e9c87: Merge "Encrypt inplace settings." into honeycomb
authorJason parks <jparks@google.com>
Fri, 21 Jan 2011 01:07:36 +0000 (17:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Jan 2011 01:07:36 +0000 (17:07 -0800)
* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
  Encrypt inplace settings.


Trivial merge