Scott Main aaa4662450 am 7bf1c661: am 034d89d9: docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs ... * commit '7bf1c661f1a43236dd075616f4f04a776710dcb0': docs: cherrypick Change-Id: I3d871d494cf1f626df701efaa43058b66893259e docs: add info about customizing the density of an AVD from command line; and a few editorial things like fix the TOCs		2011-05-05 17:56:50 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -07:00
libs	Merge "Implement support for ALT and SHIFT modifiers"	2011-04-29 09:59: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	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