Brian Muramatsu 17e76c082e am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb ... * commit '910be3e855738eab783f2e280b76dcef90a841ec': Fix TextUtils#commaEllipsize		2011-01-28 14:55:31 -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 2a8f8d57: Merge "Quiet the SurfaceFlingerClient dequeueBuffer error." into honeycomb	2011-01-28 14:15:44 -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