Joe Onorato 6443de56f3 resolved conflicts for merge of 7f9ede96 to master ...

Change-Id: Iaa688e5f7adaa363c88e0824b44233c8906e9e26

2010-06-29 12:58:39 -04:00

..

config

…

java

set maximum image size

2010-06-29 09:06:33 -04:00

jni

am 96725326: am 31e0ffe8: Merge "Native input event dispatching." into gingerbread

2010-06-28 19:16:42 -07:00

res

resolved conflicts for merge of 7f9ede96 to master

2010-06-29 12:58:39 -04:00

tests

Rename a data storage object to better reflect its intended usage.

2010-06-28 12:59:48 -04:00