Daniel Sandler 5dbf6527c4 am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. ... * commit 'f5699b82adef34b0b6bd88554c6a017f8662985e': DO NOT MERGE. Restore status bar on phones.		2011-06-03 11:26:17 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2	2011-06-02 17:33:55 -07:00
libs	am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2	2011-06-02 17:33:55 -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