Michael Kolb 9b6d286b25 am d8b243fe: am d7e80b9d: Merge "fix NPE in getSearchBox" into honeycomb-mr1 ... * commit 'd8b243fea28abda8b0a35b4698a7fe72c39fcace': fix NPE in getSearchBox		2011-03-04 01:01:21 -08:00
cmds
include	Merge "Add TextLayout Cache"	2011-03-03 12:21:15 -08:00
libs	Wake screen from external HID peripherals.	2011-03-02 19:57:07 -08:00
opengl	Clean up use of HAVE_ANDROID_OS	2011-02-16 10:56:32 -08:00
services/surfaceflinger	remove some logs	2011-03-02 18:45:50 -08:00
vpn	Make VpnService synchronous API.	2011-01-20 12:51:43 +08:00
GenerationCache.h	Add TextLayout Cache	2011-03-02 13:29:20 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00