summaryrefslogtreecommitdiffstats
path: root/core/version_defaults.mk
Commit message (Collapse)AuthorAgeFilesLines
* Fake version number for AOSP master - do not mergeJean-Baptiste Queru2013-05-201-1/+1
| | | | Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
* Here lies JB MR2: In with a whimper, out with a bang.Dianne Hackborn2013-04-221-3/+3
| | | | Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
* You would not believe how much we all love jelly beans.Dianne Hackborn2013-02-011-2/+2
| | | | | | | | | | Seriously. We looooooove them. Especially Ryan. Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
* It's a new version!Nick Kralevich2012-12-121-2/+2
| | | | Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
* resolved conflicts for merge of 0f4e3718 to masterJean-Baptiste Queru2012-12-031-1/+1
|\ | | | | | | Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
| * Merge d2e4c25eJean-Baptiste Queru2012-12-031-1/+1
| |\ | | | | | | | | | Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
| | * Obviously JB MR1.1 should be Android 4.2.2.Dianne Hackborn2012-12-031-1/+1
| | | | | | | | | | | | Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
| * | Merge f7306051c160edc22cf32da09eca310ff0e18177Jean-Baptiste Queru2012-11-191-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
| | * bump version to 4.2.1Ed Heyl2012-11-191-1/+1
| |/ |/| | | | | Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
| * Version number for AOSP master - do not mergeJean-Baptiste Queru2012-11-091-2/+2
|/ | | | Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
* 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
| | | | Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
* am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"Jean-Baptiste Queru2012-08-141-1/+0
|\ | | | | | | | | * commit '7159a992ddcda51c91843a29cd1aa30815bc8370': Set the AOSP master to be API level 16
| * Set the AOSP master to be API level 16Jean-Baptiste Queru2012-08-141-2/+1
| | | | | | | | Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
| * Restore AOSP-style version numbers - do not mergeJean-Baptiste Queru2012-05-011-2/+2
| | | | | | | | Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
* | This branch is now JB MR1 development.Dianne Hackborn2012-07-301-2/+2
| | | | | | | | Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
* | JellyBean is now 4.1.Dianne Hackborn2012-05-101-3/+3
|/ | | | Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
* You know back when I said this thing about Ice Cream Sandwich MR2?Dianne Hackborn2012-01-251-2/+2
| | | | | | | | | | | | | | | | | | What was I thinking? That would be *ridiculous*. What sane person would come up with a release like that?!? I mean... four words! Six if you try to say it! Insane!! Instead, we shall call you: Jelly Bean. Yum. Change-Id: Ice28fc17b7eb77cf6b708958161339890234d1d8
* Dev branch for ICS MR2.Dianne Hackborn2011-11-101-2/+2
| | | | Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
* MR1 is version 4.1, API 15.Dianne Hackborn2011-11-021-2/+2
| | | | Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
* Let's call MR0 4.0.1.Dianne Hackborn2011-09-211-1/+1
| | | | Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
* Hello, Android 4.0.Dianne Hackborn2011-09-141-3/+3
| | | | Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
* resolved conflicts for merge of 3f72af13 to masterDianne Hackborn2011-06-101-1/+1
|\ | | | | | | Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
| * Merge cb5b6d16Dianne Hackborn2011-06-101-1/+1
| |\ | | | | | | | | | Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
| | * Welcome, Android 3.2.Dianne Hackborn2011-06-091-3/+3
| | | | | | | | | | | | Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
| * | Merge 5d66a07d - do not mergeJean-Baptiste Queru2011-05-191-2/+2
| |\ \ | | |/ | |/| | | | Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
| | * Use actual numbers in version numbers.Jean-Baptiste Queru2011-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This string is used in the browser user agent, and some sites get confused when this isn't a dotted-number version number into thinking that they should serve stripped down HTML. This clears the confusion. Change-Id: I6c959ff17c540a1f3808f19238b9eb93ba170d2e
| | * Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not mergeJean-Baptiste Queru2011-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | This reverts commit 7e1ce27c08ec57032520613488ec2fe5b3795126, reversing changes made to 7dfc1270967c96be6dcd58fb7770c07482a7e90d. Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
| * | DO NOT MERGE. We are now dev branch for Honeycomb MR2.Dianne Hackborn2011-05-091-2/+2
| | | | | | | | | | | | Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
* | | Onward and upward! And ice cream for all!Dianne Hackborn2011-03-241-2/+2
|/ / | | | | | | Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
* | It's a new version!Dianne Hackborn2011-03-091-3/+3
| | | | | | | | Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
* | resolved conflicts for merge of b5952289 to masterThe Android Automerger2011-01-231-2/+2
|\ \ | | | | | | | | | Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
| * \ resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aospThe Android Automerger2011-01-231-2/+2
| |\ \ | | |/ | |/| | | | Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
| | * DO NOT MERGE. Hello, Android 3.0 API 11.Dianne Hackborn2011-01-231-3/+3
| |/ |/| | | | | Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
| * Merge commit '50738779' into gingerbread-plus-aospEd Heyl2011-01-201-2/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: core/version_defaults.mk Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
| | * DO NOT MERGE Fix issue #3373438: Update GBMR versionsDianne Hackborn2011-01-201-1/+1
| | | | | | | | | | | | Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
| * | resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGEJean-Baptiste Queru2010-12-141-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
| | * (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"Dianne Hackborn2010-12-141-2/+2
| | | | | | | | | | | | | | | | | | We are now version 2.4, API 10. Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
| | * 2.3.1android-merger2010-12-091-1/+1
| | | | | | | | | | | | Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
| | * Gingerbread becomes real.Dianne Hackborn2010-10-181-3/+3
| | | | | | | | | | | | Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
| | * kraken --> gingerbreadEd Heyl2010-06-111-2/+2
| | | | | | | | | | | | Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
| * | Update platform version strings for AOSPJean-Baptiste Queru2010-06-281-2/+2
| | | | | | | | | | | | Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
* | | Bump API version up to 10, thus resource version up to 11.Dianne Hackborn2011-01-161-1/+1
| | | | | | | | | | | | Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
* | | We. Are. Honeycomb!Dianne Hackborn2011-01-061-2/+2
| | | | | | | | | | | | Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
* | | We are API 9 compatible.Dianne Hackborn2010-10-201-1/+1
| | | | | | | | | | | | Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
* | | Change version codename.Dianne Hackborn2010-07-271-2/+2
| | | | | | | | | | | | Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
* | | fix platform nameEd Heyl2010-06-111-2/+2
| | | | | | | | | | | | Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
* | | Mmmmmm... Gingerbread!Dianne Hackborn2010-04-191-2/+2
| |/ |/| | | | | Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
* | On to Kraken...Dianne Hackborn2010-04-151-2/+2
|/ | | | Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
* It's beginning to look a lot like release time!Dianne Hackborn2010-04-051-3/+3
| | | | | | | | | | | Everywhere we build... Froyo is now Android 2.2, API 8. This breaks the YouTube prebuilt (yay prebuilts!) but little else. Does this mean we are becoming mature? Change-Id: I15d228d57853a0dfabc47dda253d55339a5b3d17
* Switch the platform name from Eclair-MR2 to Froyo.Jeff Hamilton2009-12-171-2/+2
|
generated by cgit v1.1 at 2025-02-19 09:50:14 +0000