Eric Fischer 1deaf0201a am 2f314844: (-s ours) am 4d3e7fb7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 ... * commit '2f3148445ff7d6df74b7a1b07858c379157e12df': Import revised translations. DO NOT MERGE		2011-03-04 13:56:52 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
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