Andreas Huber 1c09d72f55 am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose to track down ANRs (again)"" into honeycomb ... * commit '35a1f771759459fc6c9b355d548c5b97cd50e110': Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"		2011-01-28 11:53:50 -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	am 256a09b2: Merge "Fix issue #3392073: At times soft keyboard comes up in..." into honeycomb	2011-01-27 22:50:56 -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