OSDN Git Service

am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread
authorKenny Root <kroot@google.com>
Thu, 14 Oct 2010 05:54:10 +0000 (22:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Oct 2010 05:54:10 +0000 (22:54 -0700)
commitd47001fc34877da2414bd9d681b14484b7744f8a
tree4fd2a85cdb33f3a7a91d99776f2abf6e8052ef55
parentac4d53405f04ee347c1b443cf28483df6446a553
parent7f7c9a24b66277312c5e0426731598b8bfd11a14
am bdf8034c: Merge "OBB: use PBKDF2 for key generation." into gingerbread

Merge commit 'bdf8034c657147226b2390eef113ff841e0d6065' into gingerbread-plus-aosp

* commit 'bdf8034c657147226b2390eef113ff841e0d6065':
  OBB: use PBKDF2 for key generation.