tree bcd78f27aa16f4eb3ac56654238d126a8b1fa06e
parent 87445514bbb2d942ebe46a632c6c4ae956218ebc
parent cf19b1ace0845714b8828a670cc1b645019e1883
author Daniel Sandler <dsandler@android.com> 1271794017 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271794017 -0700

am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)" into froyo

Merge commit '29019cb9773dfc7645c9326725a6ac514020eef7' into kraken

* commit '29019cb9773dfc7645c9326725a6ac514020eef7':
  Make the silent/vibrate status icon reflect overall device state. (DO NOT MERGE)