summaryrefslogtreecommitdiffstats
path: root/core/version_defaults.mk
Commit message (Expand)AuthorAgeFilesLines
* Restore AOSP-style version numbers - DO NOT MERGEBill Yi2014-06-191-2/+2
* 4.4.3 is MR2, version boogaloo!Dianne Hackborn2014-03-111-1/+1
* .1 becomes .2Dave Langemak2013-12-031-1/+1
* Just a little .1 makes all the difference in the world.Dianne Hackborn2013-11-141-1/+1
* So long Key Lime Pie, it was nice knowing you.Dianne Hackborn2013-10-031-3/+3
* Bump up to API 18 to match jbmr2.Dianne Hackborn2013-04-301-1/+1
* Welcome, Key Lime Pie.Dianne Hackborn2013-03-051-2/+2
* You would not believe how much we all love jelly beans.Dianne Hackborn2013-02-011-2/+2
* It's a new version!Nick Kralevich2012-12-121-2/+2
* resolved conflicts for merge of 0f4e3718 to masterJean-Baptiste Queru2012-12-031-1/+1
|\
| * Merge d2e4c25eJean-Baptiste Queru2012-12-031-1/+1
| |\
| | * Obviously JB MR1.1 should be Android 4.2.2.Dianne Hackborn2012-12-031-1/+1
| * | Merge f7306051c160edc22cf32da09eca310ff0e18177Jean-Baptiste Queru2012-11-191-1/+1
| |\ \ | | |/
| | * bump version to 4.2.1Ed Heyl2012-11-191-1/+1
| |/ |/|
| * Version number for AOSP master - do not mergeJean-Baptiste Queru2012-11-091-2/+2
|/
* Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!Dianne Hackborn2012-09-271-3/+3
* am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-1/+0
|\
| * Set the AOSP master to be API level 16Jean-Baptiste Queru2012-08-141-2/+1
| * Restore AOSP-style version numbers - do not mergeJean-Baptiste Queru2012-05-011-2/+2
* | This branch is now JB MR1 development.Dianne Hackborn2012-07-301-2/+2
* | JellyBean is now 4.1.Dianne Hackborn2012-05-101-3/+3
|/
* You know back when I said this thing about Ice Cream Sandwich MR2?Dianne Hackborn2012-01-251-2/+2
* Dev branch for ICS MR2.Dianne Hackborn2011-11-101-2/+2
* MR1 is version 4.1, API 15.Dianne Hackborn2011-11-021-2/+2
* Let's call MR0 4.0.1.Dianne Hackborn2011-09-211-1/+1
* Hello, Android 4.0.Dianne Hackborn2011-09-141-3/+3
* resolved conflicts for merge of 3f72af13 to masterDianne Hackborn2011-06-101-1/+1
|\
| * Merge cb5b6d16Dianne Hackborn2011-06-101-1/+1
| |\
| | * Welcome, Android 3.2.Dianne Hackborn2011-06-091-3/+3
| * | Merge 5d66a07d - do not mergeJean-Baptiste Queru2011-05-191-2/+2
| |\ \ | | |/ | |/|
| | * Use actual numbers in version numbers.Jean-Baptiste Queru2011-05-101-1/+1
| | * Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not mergeJean-Baptiste Queru2011-01-211-1/+1
| * | DO NOT MERGE. We are now dev branch for Honeycomb MR2.Dianne Hackborn2011-05-091-2/+2
* | | Onward and upward! And ice cream for all!Dianne Hackborn2011-03-241-2/+2
|/ /
* | It's a new version!Dianne Hackborn2011-03-091-3/+3
* | resolved conflicts for merge of b5952289 to masterThe Android Automerger2011-01-231-2/+2
|\ \
| * \ resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aospThe Android Automerger2011-01-231-2/+2
| |\ \ | | |/ | |/|
| | * DO NOT MERGE. Hello, Android 3.0 API 11.Dianne Hackborn2011-01-231-3/+3
| |/ |/|
| * Merge commit '50738779' into gingerbread-plus-aospEd Heyl2011-01-201-2/+1
| |\
| | * DO NOT MERGE Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-1/+1
| * | resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGEJean-Baptiste Queru2010-12-141-1/+1
| |\ \ | | |/
| | * (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"Dianne Hackborn2010-12-141-2/+2
| | * 2.3.1android-merger2010-12-091-1/+1
| | * Gingerbread becomes real.Dianne Hackborn2010-10-181-3/+3
| | * kraken --> gingerbreadEd Heyl2010-06-111-2/+2
| * | Update platform version strings for AOSPJean-Baptiste Queru2010-06-281-2/+2
* | | Bump API version up to 10, thus resource version up to 11.Dianne Hackborn2011-01-161-1/+1
* | | We. Are. Honeycomb!Dianne Hackborn2011-01-061-2/+2
* | | We are API 9 compatible.Dianne Hackborn2010-10-201-1/+1
* | | Change version codename.Dianne Hackborn2010-07-271-2/+2