Dianne Hackborn ea5d261564 am 9d0f2c6d: Merge "DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation." into honeycomb-mr2 ... * commit '9d0f2c6d970a1d2c7f9de5c9e89737d7772f95d3': DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.		2011-05-16 13:02:57 -07:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	DO NOT MERGE. Integrate add new screen width/height in "dp" configs.	2011-05-12 18:39:51 -07:00
libs	DO NOT MERGE. Integrate add new screen width/height in "dp" configs.	2011-05-12 18:39:51 -07:00
opengl	fix [4107131] nvidia driver call takes a very long time	2011-03-16 14:19:03 -07:00
services/surfaceflinger	Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1	2011-03-18 17:32:25 -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