Jeff Sharkey a490bddc8b Merge changes I4513afbd,I20e2194c into jb-mr1-dev ...

* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.

2012-09-19 11:22:14 -07:00

..

java

Merge changes I4513afbd,I20e2194c into jb-mr1-dev

2012-09-19 11:22:14 -07:00

jni

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

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

res

Merge "Get strings in" into jb-mr1-dev

2012-09-18 22:34:34 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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