summaryrefslogtreecommitdiffstats
path: root/liblog
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'readonly-p4-master'Wink Saville2009-04-021-1/+5
|\
| * AI 144245: Fix merge conflict for megering in the CDMA changes in to master ↵Wink Saville2009-04-021-1/+5
| | | | | | | | | | | | from donutburger. Automated import of CL 144245
| * Automated import from //branches/master/...@140824,140824Dianne Hackborn2009-03-241-0/+190
| |
* | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-0/+190
|\ \
| * | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-191-0/+190
| |/
* | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-182-8/+16
|\ \ | |/ | | | | | | | | Conflicts: init/devices.c libpixelflinger/Android.mk
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-035-0/+2397
| |
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-035-2389/+0
| |
| * auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-131-1/+1
| |
* | auto import from //branches/cupcake/...@126645android-build SharedAccount2009-01-151-0/+1
|\ \ | |/
| * auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-0/+1
| |
* | 1. added macro definitions to AndroidConfig.hAlexey Tarasov2008-11-071-1/+0
|/ | | | 2. removed unnecessary include of <alloca.h>
* Initial ContributionThe Android Open Source Project2008-10-215-0/+2388