Chung-yih Wang a06ad953a2 am 7324489f: Merge "Add SIP service into system server." into gingerbread ...

Merge commit '7324489f18ee01586931f577f00567092cbf52df' into gingerbread-plus-aosp

* commit '7324489f18ee01586931f577f00567092cbf52df':
  Add SIP service into system server.

2010-08-05 19:37:59 -07:00

..

config

…

java

am 7324489f: Merge "Add SIP service into system server." into gingerbread

2010-08-05 19:37:59 -07:00

jni

am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread

2010-08-05 10:40:45 -07:00

res

Import revised translations. DO NOT MERGE

2010-08-04 10:37:25 -07:00

tests

am 499b7438: Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread

2010-08-05 17:15:08 -07:00