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

Merge commit '173ea0912af296c6e80d14b764046534b316d21f' into gingerbread-plus-aosp

* commit '173ea0912af296c6e80d14b764046534b316d21f':
  DO NOT MERGE - use appropriate names on SQL numbers in 'adb bugreport'