summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/AbstractTableMerger.java
Commit message (Expand)AuthorAgeFilesLines
* do not merge: cherrypicked 3710f390968e683a0ad3adf0b517dfcade3564ce from mast...Fred Quintana2009-08-151-3/+3
* resolved conflicts for merge of 732140ce to masterKen Shirriff2009-07-201-23/+26
|\
| * Fix updates from read-only calendar.Ken Shirriff2009-07-201-23/+26
* | Fix AbstractTableMerger for new Account format.Ken Shirriff2009-06-151-2/+3
* | resolved conflicts for merge of 410ea6 to masterKen Shirriff2009-06-081-5/+4
|\ \ | |/
| * Fix contact creation.Ken Shirriff2009-06-081-4/+4
* | resolved conflicts for merge of 716b56 to masterKen Shirriff2009-06-051-20/+28
|\ \ | |/
| * Don't crash on null edit url.Ken Shirriff2009-06-041-20/+28
* | change the sync framework and users to understand AccountFred Quintana2009-04-231-13/+18
* | Automated import from //branches/master/...@141380,141380Fred Quintana2009-03-241-286/+287
|/
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+582
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-582/+0
* auto import from //branches/cupcake/...@126645The Android Open Source Project2009-01-151-57/+51
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-1/+11
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-1/+2
* Initial ContributionThe Android Open Source Project2008-10-211-0/+577