John Reck 57162780ea am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2 ... * commit '82de141db736b95b0e388ff060e2d2535192d769': DO NOT MERGE Use previous version if version is a codename		2011-05-23 16:53:28 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2	2011-05-23 16:16:54 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00