am d82cc1de: Merge "Fixup JNI" into ics-mr0

* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
  Fixup JNI
This commit is contained in:
John Reck 2011-10-14 10:12:14 -07:00 committed by Android Git Automerger
commit 3ed5fcdac2

Diff Content Not Available