Amith Yamasani b8e362ae27 am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev ...

* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user

2012-09-19 05:50:07 -07:00

..

java

am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev

2012-09-19 05:50:07 -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 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev

2012-09-18 18:52:40 -07:00

tests

Code cleanup for X509TrustManagerExtensionsTest.java

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