Vasu Nori b4e1221611 am 7489a470: am d529d0df: Merge "bug:3396894 (HC branch) remove STOPSHIP code" into honeycomb ... * commit '7489a4709daf39aff61a17818de282d9ca4dc7c8': bug:3396894 (HC branch) remove STOPSHIP code		2011-01-26 23:47:22 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycomb	2011-01-25 18:22:50 -08:00
libs	Revert "libutils: Fix race condition in Thread::requestExitAndWait()"	2011-01-25 09:41:20 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	fix [3385504] Surface flinger hang when adding dim surface	2011-01-25 20:52:46 -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