Jean-Baptiste Queru 62d9009da1 am 45e13ec1: am 5fcfce96: am 4b72eec3: Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise." ... * commit '45e13ec1c5cd765162b7450b1c3a4632e8979894': Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise.		2011-04-26 10:24:27 -07:00
cmds
include	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -07:00
libs	resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp	2011-04-12 10:27:15 -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