am 5d96b2d2: am 5a9fc269: Properly merge \'Patch to enable low level traces.\'

* commit '5d96b2d2dd4ba566dcb0fd5e1b5f0e84e458c4af':
  Properly merge 'Patch to enable low level traces.'
tree: 7403b0d529f398359f5003304f69ff4ec587deb0
  1. inc/
  2. Linux_x86/
  3. src/
  4. Android.mk