Commit Graph

515 Commits

Author SHA1 Message Date
Wink Saville 83eb023a09 Merge branch 'readonly-p4-master' 2009-04-02 11:02:19 -07:00
Wink Saville 89efdc9c7f AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:57 -07:00
Wink Saville 7bdfb165ad AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
The Android Open Source Project 7be77b5ba8 Merge commit 'korg/cupcake' 2009-03-27 15:31:14 -07:00
Dianne Hackborn f441e1e9c4 Automated import from //branches/donutburger/...@140818,140818 2009-03-24 18:36:55 -07:00
Dianne Hackborn 161b03c7ec Automated import from //branches/master/...@140824,140824 2009-03-24 18:36:50 -07:00
The Android Open Source Project 3207e48071 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:09:00 -07:00
Jean-Baptiste Queru 83b65486be Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	init/devices.c
	libpixelflinger/Android.mk
2009-03-18 09:29:29 -07:00
The Android Open Source Project dd7bc3319d auto import from //depot/cupcake/@135843 2009-03-03 19:32:55 -08:00
The Android Open Source Project e54eebbf1a auto import from //depot/cupcake/@135843 2009-03-03 18:29:04 -08:00
The Android Open Source Project 1b8e5a6b14 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:54 -08:00
android-build SharedAccount 439f6ca123 auto import from //branches/cupcake/...@126645 2009-01-15 16:22:10 -08:00
The Android Open Source Project 2eef60297a auto import from //branches/cupcake/...@126645 2009-01-15 16:12:14 -08:00
Alexey Tarasov abb9638e36 1. added macro definitions to AndroidConfig.h
2. removed unnecessary include of <alloca.h>
2008-11-07 11:44:22 +10:00
The Android Open Source Project 4f6e8d7a00 Initial Contribution 2008-10-21 07:00:00 -07:00