Leon Scroggins f76f6f5c63 am 00c50b2e: am f348502c: Merge "Allow TextView to do its thing." into gingerbread ...

Merge commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065'

* commit '00c50b2e49dbb3537a3ee553dc79d6e34cd00065':
  Allow TextView to do its thing.

2010-10-13 19:14:19 -07:00

..

config

…

java

am 00c50b2e: am f348502c: Merge "Allow TextView to do its thing." into gingerbread

2010-10-13 19:14:19 -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