Xavier Ducrohet a81e01a111 am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread ... * commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf': Merge 05b7b69c from honeycomb-mr1. do not merge.		2011-05-23 10:21:57 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	2011-05-19 19:34:21 -07:00
libs	am c851ea56: am 69cb8757: Add new "-swNNNdp" resource qualifier.	2011-05-19 19:34:21 -07:00
opengl	Merge from gingerbread	2011-03-29 13:54:43 -07:00
services/surfaceflinger	am a47c0d29: am 58e4a5e2: Merge "Fixed to draw texture when loadTexture() is called at first time"	2011-04-29 17:15:35 -07: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 adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00