tree dc541a739b2c53aa505c12af918429b671e20c1e
parent be4696e073b93e0e65f767e77166a08efd67c6cb
parent 4f2436dc3513f671935811bfa0c7e6c2c15505be
author Scott Main <smain@google.com> 1281046205 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281046205 -0700

am 4f2436dc: update carousel icon for nexus one dev phone

Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread

* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
  update carousel icon for nexus one dev phone