tree b15d8f2509c1cc719e8152a06b6ed59d4d8dd573
parent b759096e91fc7be9217b0e5ba89c19590e21cc39
parent 6e48b5f97af6d67574fee6053174c184f87ce583
author Justin Ho <justinho@google.com> 1287244826 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287244826 -0700

am 6e48b5f9: (-s ours) am b593d976: Merge "Updated GPS icons and new status bar background" into gingerbread

Merge commit '6e48b5f97af6d67574fee6053174c184f87ce583'

* commit '6e48b5f97af6d67574fee6053174c184f87ce583':
  Updated GPS icons and new status bar background