Michael Wright fe98be7533 am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)" ...

* commit '65b0052a7473b73a18aef73460c9ebec77a2c2a0':
  Remove SurfaceControl.setPosition(int, int)

2013-02-21 16:09:05 -08:00

..

java

am 65b0052a: Merge "Remove SurfaceControl.setPosition(int, int)"

2013-02-21 16:09:05 -08:00

jni

am e4d3b06b: Merge "get rid of uses of getISurfaceTexture"

2013-02-21 15:24:21 -08:00

res

Improve notification UI for lockdown VPN.

2013-02-21 09:47:11 -08:00

tests

am f7bf667d: am b5a1ce2f: Merge "Allow three digit phone numbers"

2013-02-21 15:19:53 -08:00