am af5fad81: am 90604ed6: Merge "Merge from gingerbread"

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