Adam Cohen 072d35167f am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev ...

* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets

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

..

java

am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev

2012-09-18 15:00:09 -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