tree 7096bb5d3c259b43b2decda2ca1ff5c875e7e898
parent 065149f1628a2882a46af810ca9fc3913f7b0438
parent b745ec954272a3c09cca354ad84e2e08b54c8544
author Vasu Nori <vnori@google.com> 1285097412 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285097412 -0700

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'