Go to file
Jamie Gennis 72f6af8630 Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8
* changes:
  SurfaceTexture: add some GL->GL tests.
  SurfaceTexture: fix up a comment.
  SurfaceTexture: add getTransformMatrix tests.
  SurfaceTexture: fix a getTransformMatrix crash.
2011-06-13 11:14:57 -07:00
cmds KeyStore.reset changes 2011-06-02 16:24:45 -07:00
include Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8 2011-06-13 11:14:57 -07:00
libs Merge changes I56779420,I044e44e1,Ic5adfa29,Ied541ab8 2011-06-13 11:14:57 -07:00
opengl fix x86 build 2011-05-23 17:48:36 -07:00
services/surfaceflinger Merge "Fix a race that could cause GL commands to be executed from the wrong thread." 2011-05-19 19:42:20 -07:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00