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)
This commit is contained in: