tree cda0df414aba383b8cc6db3fb6a359cca7746edc
parent 19b2174b28d3b2092027e09264b5051d4628065c
parent 6bb6bc20d99dd79400f12ff60dccd2b59a91c383
author Brett Chabot <brettchabot@android.com> 1319631757 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319631757 +0000

am 6bb6bc20: Merge "Change --no-collect-device-info to --skip-device-info/-d." into ics-mr0

* commit '6bb6bc20d99dd79400f12ff60dccd2b59a91c383':
  Change --no-collect-device-info to --skip-device-info/-d.