Joe Onorato eb86aaaab3 am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread ...

Merge commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96'

* commit '9a12a3c8d4bb20042cf69e07d268e3a04ac71f96':
  Remove dead code, and make the animation a setting.
  turn off the electron beam

2010-10-13 23:34:21 -07:00

..

config

…

java

am 090ac9f7: am a3100314: Merge "Remove some PII." into gingerbread

2010-10-13 19:40:16 -07:00

jni

Add a getNativeMatrix() API.

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

res

am 9a12a3c8: am ba799098: Merge changes I76513387,I335fb671 into gingerbread

2010-10-13 23:34:21 -07:00

tests

resolved conflicts for merge of 8bb7a1df to master

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