OSDN Git Service

am 29019cb9: (-s ours) am c96307ef: Merge "Make the silent/vibrate status icon reflec...
authorDaniel Sandler <dsandler@android.com>
Tue, 20 Apr 2010 20:06:57 +0000 (13:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Apr 2010 20:06:57 +0000 (13:06 -0700)
Merge commit '29019cb9773dfc7645c9326725a6ac514020eef7' into kraken

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


Trivial merge