Brett Chabot f22e876393 resolved conflicts for merge of 10928c37 to master ...

Change-Id: Idbe91a2fe90cab0a03fdef096dc6741dc5937351

2010-08-04 12:03:46 -07:00

..

config

…

java

am 9f6b16a2: am 5d46ce24: Merge "Enhanced VelocityTracker for > 5 pointers and fixed bugs." into gingerbread

2010-08-04 11:12:32 -07:00

jni

Add support for ColorFilters.

2010-08-02 18:50:56 -07:00

res

Add android:hardwareAccelerated to Activity.

2010-08-04 10:55:46 -07:00

tests

resolved conflicts for merge of 10928c37 to master

2010-08-04 12:03:46 -07:00