tree 9d4f08a5b707a78d8787b19668efa975a6625881
parent 4fa7f4f4963568258a6b4179176de8386cb5d3db
parent 3d828e62c856074334a00ce7c621050b4d7166e4
author Joe Onorato <joeo@google.com> 1287082987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287082987 -0700

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