am 944e51f4: Merge from gingerbread

* commit '944e51f48620da730be85df3845fe4101bcbf80b':
  Patch to enable low level traces.
tree: 3c34b1f6e8b160038f705c5f09308545ef597320
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk