summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-10-14 20:52:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-14 20:52:11 -0700
commitebad42d6d35dc0dc07fe89650268453dbdff8a79 (patch)
treeed3e2042361e96aa7eab1aa03ff8ea1bcae581b3 /libs
parent6e48b5f97af6d67574fee6053174c184f87ce583 (diff)
parent3fbfee2febf13bcc46c389ebecbf91465ef211b7 (diff)
downloadframeworks_base-ebad42d6d35dc0dc07fe89650268453dbdff8a79.zip
frameworks_base-ebad42d6d35dc0dc07fe89650268453dbdff8a79.tar.gz
frameworks_base-ebad42d6d35dc0dc07fe89650268453dbdff8a79.tar.bz2
am 3fbfee2f: Merge "SipService: add wake lock for incoming INVITE packets." into gingerbread
Merge commit '3fbfee2febf13bcc46c389ebecbf91465ef211b7' into gingerbread-plus-aosp * commit '3fbfee2febf13bcc46c389ebecbf91465ef211b7': SipService: add wake lock for incoming INVITE packets.
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions