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'