Dianne Hackborn cbf3ce51c8 am f97ed771: (-s ours) am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 ... * commit 'f97ed771979162c4a2a75959c57fb793438a3a8b': DO NOT MERGE. Integrate from master: Rework display size access.		2011-05-16 13:11:24 -07:00
cmds	Replace a custom AndroidRuntime::findClass with a more targeted fix.	2011-04-13 16:43:15 -07:00
include	Add initial API for stylus and mouse buttons.	2011-05-13 12:11:17 -07:00
libs	Merge "Full backup tweaks"	2011-05-13 15:41:32 -07:00
opengl	fix (Again) adding OES postfix when looking for gl functions	2011-05-11 20:37:47 -07:00
services/surfaceflinger	Fix a race in SurfaceFlinger that could cause layers to be leaked forever.	2011-05-03 20:44:51 -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