Go to file
Jason Chen aa11f79c80 am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
  DO NOT MERGE Cherry-pick of cd59febcea2 from master
2011-03-01 17:54:26 -08:00
cmds KeyStore: Update the parameters of generating master keys. 2010-10-01 01:42:55 +08:00
include am 93552de8: Merge "stubs" 2011-02-11 09:54:59 -08:00
libs am c2efcd2c: Merge "Initialize the SurfaceTexture transform fields." into honeycomb 2011-02-04 15:05:28 -08:00
opengl am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread 2011-02-23 12:46:57 -08:00
services/surfaceflinger am e630e5f4: am 919853ce: Merge "Prevent SurfaceFlinger from using layer token 31." into gingerbread 2011-02-27 15:55:21 -08:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
NOTICE resolved conflicts for merge of 00118a48 to honeycomb-merge 2011-01-27 18:25:32 -08:00