tree 60e01d1b54244b5da6a07286d5794b6fb7346442
parent 37b62b7debd8aa3f8d8fdcd42d3f4bc6e6662a9e
parent f510542648d4d476bddfcb7befc32ed50bf83577
author Justin Ho <justinho@google.com> 1287348567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287348567 -0700

am 92e0fd6c: (-s ours) am d3643668: Merge "DO NOT MERGE - Updated ADB icon" into gingerbread

Merge commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98'

* commit '92e0fd6ce20a111e9ad82b5b252b892e2b971b98':
  DO NOT MERGE - Updated ADB icon