am b745ec95: (-s ours) am 173ea091: Merge "DO NOT MERGE - use appropriate names on SQL numbers in \'adb bugreport\'" into gingerbread

Merge commit 'b745ec954272a3c09cca354ad84e2e08b54c8544'

* commit 'b745ec954272a3c09cca354ad84e2e08b54c8544':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'
tree: 25d414048817d4a815150609c0ee56b358a0b4bb
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE