Hung-ying Tyan b6432ca4a0 am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread ...

Merge commit '960b31e3b3b40f92665be4b7a79da7f05ea19751' into gingerbread-plus-aosp

* commit '960b31e3b3b40f92665be4b7a79da7f05ea19751':
  SipService: unset session listener if listener is gone.

2010-09-06 20:16:51 -07:00

..

com/android/server

am 960b31e3: Merge "SipService: unset session listener if listener is gone." into gingerbread

2010-09-06 20:16:51 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00