am 90604ed6: Merge "Merge from gingerbread"

* commit '90604ed66801fd663924bea614c5f024c7452d39':
tree: a83247a714428a7f391112a1f718e590c95185dc
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk