Jim Miller df4bf54de6 am a497e944: am adc14026: Merge "Fix 3381660: Make modifier keys in PasswordUnlock match IME" into honeycomb ... * commit 'a497e9448ef2e52db28ba0c400ae3b94ac1b6fc4': Fix 3381660: Make modifier keys in PasswordUnlock match IME		2011-01-25 16:34:16 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb	2011-01-24 13:30:37 -08:00
libs	Revert "libutils: Fix race condition in Thread::requestExitAndWait()"	2011-01-25 09:41:20 -08:00
opengl	egl: fix GetProcAddress for EGLimage extensions	2011-01-16 18:12:04 -08:00
services/surfaceflinger	tone down the log spew regarding taking screenshots.	2011-01-24 18:13:54 -08: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