tree d39863148087760fc00f6c6a9168bac67daf8c9c
parent 77e42376823197ae7fb3cea2afcca734723174a5
parent 33a4c77218e4513268be8d5ce2af6f746976706b
author Gilles Debunne <debunne@google.com> 1286228832 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286228832 -0700

am 33a4c772: Merge "New green in assets for battery, download, upload" into gingerbread

Merge commit '33a4c77218e4513268be8d5ce2af6f746976706b' into gingerbread-plus-aosp

* commit '33a4c77218e4513268be8d5ce2af6f746976706b':
  New green in assets for battery, download, upload