Jeff Sharkey ed1a377f80 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev ...

* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.

2012-09-18 15:00:33 -07:00

..

java

am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev

2012-09-18 15:00:33 -07:00

jni

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

2012-09-18 14:59:38 -07:00

res

am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev

2012-09-18 10:44:24 -07:00

tests

Fix bad isinstance check in X509TrustManagerExtensions and add test.

2012-09-18 13:43:32 -07:00