Chia-chi Yeh 12eaf9d50c am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread ...

Merge commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6' into gingerbread-plus-aosp

* commit 'dc296b0d4bd6fef8764c10fb4cd59c85bc5186f6':
  SipService: reduce the usage of javax.sdp.*.

2010-09-02 08:17:11 -07:00

..

com/android/server

am dc296b0d: Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread

2010-09-02 08:17:11 -07:00

Android.mk

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

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