tree 58be0affeafef6d38ef9e53744af1aaf1a7a8fa8
parent cebe5b2e01f8ebbf9089aebc386caecea232df76
parent 3b1abba6bbc895d63da3e82e9b158c01bd12eddd
author Kenny Root <kroot@google.com> 1287019783 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287019783 -0700

Merge "OBB: use PBKDF2 for key generation." into gingerbread