Chung-yih Wang bad553ba34 am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default config. ...

Merge commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03'

* commit 'b99db0c70e0ee18e0a691126134b9394f30f7f03':
  Set the wifi-only for SIP service as the default config.

2010-10-13 17:02:24 -07:00

..

config

…

java

Merge "Dynamically show the menu button on the system bar."

2010-10-13 16:32:07 -07:00

jni

Add a getNativeMatrix() API.

2010-10-13 13:40:37 -07:00

res

am b99db0c7: am 4367ab00: Set the wifi-only for SIP service as the default config.

2010-10-13 17:02:24 -07:00

tests

resolved conflicts for merge of 8bb7a1df to master

2010-10-13 15:43:51 -07:00