tree d4b735587fd9c7da8fcc1caa8cde63814941ad0a
parent 17692569661b9fd20d7a953fce6355b176a5ab2f
parent 92e0fd6ce20a111e9ad82b5b252b892e2b971b98
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