Jeff Sharkey 4046e01288 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

2012-09-19 14:52:34 -07:00

..

java

Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev

2012-09-19 14:52:34 -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

Code cleanup for X509TrustManagerExtensionsTest.java

2012-09-18 14:44:54 -07:00