Jeff Sharkey 4e7b551fbf Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev

2012-09-19 19:16:24 -07:00

..

java

Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev

2012-09-19 19:16:24 -07:00

jni

Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev

2012-09-18 14:32:01 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

2012-09-19 12:34:40 -07:00

tests

Migrate network stats from removed users.

2012-09-19 14:54:05 -07:00