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)
commitf947ca515771269b78726fc7609a8e791d5d562a
treedba18bb5bbfeb253ed316b3bd0af9614ecffd94e
parent596c5e1adccdc081a6982d1833cd2e93c8fe7ecd
parenta13e9c877ce4928df0095f47b6117cc4b5403fb2
am a13e9c87: Merge "Encrypt inplace settings." into honeycomb

* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
  Encrypt inplace settings.