tree 24319683f246c43300aa32f54f99ea214d614a3b
parent 734b8b8cb8b083c62870d63903eb478c3ebe259f
parent 8a3621866d8a04b0a229eb5765ea9799e68fd90c
author Hung-ying Tyan <tyanh@google.com> 1287116394 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287116394 -0700

am 8a362186: am f1b1eec9: Merge "SipService: mScreenOn is flipped to wrong value." into gingerbread

Merge commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c'

* commit '8a3621866d8a04b0a229eb5765ea9799e68fd90c':
  SipService: mScreenOn is flipped to wrong value.