Dianne Hackborn 8d3fe6613a am 7b5cb3c0: Merge "Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl..." into honeycomb-mr1 ... * commit '7b5cb3c033f758368580664a8bdad43b47f3682d': Fix issue #4068088: NPE at com.android.internal.os.BatteryStatsImpl...		2011-03-09 15:50:34 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
libs	Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1	2011-03-09 14:47:56 -08:00
opengl	am fa238f03: Merge "egl: fixes for object refcounts" into gingerbread	2011-02-23 12:46:57 -08:00
services/surfaceflinger	ANativeWindow: add queues-to-window-composer check.	2011-03-08 16:49:51 -08: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