Michael Jurka 11f754ce5e Fix the build ...

Change-Id: I5ec8bfc66d24688b77f15a0ada6cb44a0940c1e1

2012-02-14 14:51:49 -08:00

..

java

Merge "Update the scale while updating the drawGL functor"

2012-02-14 12:51:19 -08:00

jni

Update comments

2012-02-14 09:17:59 -08:00

res

Fix the build

2012-02-14 14:51:49 -08:00

tests

am 5f5ea91f: am eb56ad18: am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1

2012-02-13 13:47:45 -08:00