Kenny Root 0a9b54e88b resolved conflicts for merge of 8bb7a1df to master ...

Change-Id: Ieec036f494a54eab74a27b954d1423bf981dd3f9

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

..

config

…

java

resolved conflicts for merge of 8bb7a1df to master

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

jni

Add a getNativeMatrix() API.

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

res

Allow icon+text action buttons

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

tests

resolved conflicts for merge of 8bb7a1df to master

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