Dianne Hackborn 36373fcf15 am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" ... * commit '371de9695508073fbbde8181eb230e99cb045206': Normalize output from aapt d		2011-01-29 23:10:33 -08:00
cmds	KeyStore: Update the parameters of generating master keys.	2010-10-01 01:42:55 +08:00
include	am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"	2011-01-29 23:10:33 -08:00
libs	am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"	2011-01-29 23:07:48 -08:00
opengl	egl: clear error on function entry	2011-01-25 15:36:21 -08:00
services/surfaceflinger	am 8d778b37: am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb	2011-01-28 18:43:08 -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