Mike Lockwood 62f5c48e9c am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 ... * commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7': StorageVolume: Add getStorageId() accessor		2011-05-17 16:44:51 -07:00
cmds
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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00