OSDN Git Service

am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread
authorJoe Onorato <joeo@google.com>
Thu, 14 Oct 2010 19:03:07 +0000 (12:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 14 Oct 2010 19:03:07 +0000 (12:03 -0700)
commiteb42bb3b234494095039c18ef8b9c28ad5daf30b
tree4fd2a85cdb33f3a7a91d99776f2abf6e8052ef55
parentd029b4fcec0a557ccb7047bd914f4611a5bb9531
parent1013d9e5df10977e3e778aac6650417c8d85fec0
am 3d828e62: Merge "Do not build pbkdf2gen on non-Linux hosts" into gingerbread

Merge commit '3d828e62c856074334a00ce7c621050b4d7166e4' into gingerbread-plus-aosp

* commit '3d828e62c856074334a00ce7c621050b4d7166e4':
  Do not build pbkdf2gen on non-Linux hosts