Robert Greenwalt 82a94afa96 Merge "resolved conflicts for merge of a7f68230 to master"

2011-07-25 17:12:22 -07:00

..

java

Merge "resolved conflicts for merge of a7f68230 to master"

2011-07-25 17:12:22 -07:00

jni

Merge "Add support for creating a Surface from a a SurfaceTexture."

2011-07-25 10:24:30 -07:00

res

Merge "Fix for http://b/issue?id=5064532"

2011-07-25 13:43:09 -07:00

tests

Touch exploration state set to clients asynchronously and depended on talking service being enabled.

2011-07-22 17:38:54 -07:00