tree 1ad98182fc998d6cd5cac18ea8be029f1d5de2fe
parent 77222360dfa52b4127f781c886dd9b1bd02c2c66
parent 6e6864a54b0b2980adf717b559278ccb95fb4020
author Nick Pelly <npelly@google.com> 1286990338 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286990338 -0700

am 527d8bbd: Merge "Add missing native methods to fix boot." into gingerbread

Merge commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a' into gingerbread-plus-aosp

* commit '527d8bbd79c1ff2b6e24d19fe9e7a1ecdb72891a':
  Add missing native methods to fix boot.