Commit graph

85 commits

Author SHA1 Message Date
Zach Jang
6575d4a2a8 Update security string to 2015-12-01 - DO NOT MERGE
Change-Id: I155ec6c2b57c899f20bb85f5a5cf031499ba81b0
2015-10-22 15:00:30 -07:00
Zach Jang
ab095b445a am 48e2b43e: am 47ef4c34: DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
* commit '48e2b43e8cc030456b0f625f321c45d2e1775130':
  DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings CL#2/3
2015-09-21 18:58:10 +00:00
Zach Jang
47ef4c3467 DO NOT MERGE - Backport of ag/748221 - Security Patch Level in Settings
CL#2/3

b/23946860

Change-Id: I42a2aaf26cf458d1775b11029789330cdd85b3a3
2015-09-17 01:22:39 +00:00
Bart Sears
1c3bf5c39d DO NOT MERGE - Bump version to 5.1.1
Bug: 19939307
Change-Id: I069f514fe6d3759aa7dde38627c54f7bed38c1bb
2015-03-25 21:04:38 -07:00
Dianne Hackborn
592c24d865 DO NOT MERGE. Bump version to 5.0.2.
Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
2014-12-11 14:21:48 -08:00
Dianne Hackborn
0421d0b115 Fix issue #18368417: 5.0 -> 5.1.
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
2014-12-04 12:10:32 -08:00
Dave Langemak
5e923c91b4 Increment Android versions to 5.0.1
Change-Id: I2880123f0d1215f2028e6d3bc3f88fee5714ae74
2014-11-17 16:37:50 -08:00
Dianne Hackborn
4a6a7524b3 Move up to API 21, Lollipop MR1.
Change-Id: I81c3455d99673447ac0bc1b48d5ab1500b2bfd20
2014-10-17 10:05:33 -07:00
Dianne Hackborn
105df2f1d2 And then L, without ever becoming a real code name, transforms like magic to 5.0.
The code name looked at 5.0 despondently.  "Won't anyone care about
me?  Why does everyone pretend like I don't even exist!"  And it
was true -- for all of its life, nobody had ever whispered L's
true name, at least not in the same breath as many other names that
were not L's at all.

But 5.0 knew better.  "L," the number said, "don't you fear.  Some
day, I am sure, your name will go up in lights.  Your name will shine
brighter than even my own.  And everyone who is anyone will know
your name, write pages and pages all about your name, and debate
endlessly about everything you are."

L could only hope this would be true.  But not today.  Today, L
is still nobody.

Change-Id: I2523dd34ff7486badf8c9cd40e43833a5ef448b8
2014-09-22 15:55:23 -07:00
Dianne Hackborn
bf9b9275af Shhhhhhh!!!
Change-Id: I3bb72742f788c70f82f311b6ffba479aa02a1eb0
2014-08-26 12:39:26 -07:00
Dianne Hackborn
997b896eeb Update to reflect KKWT's graduation to API 20.
Change-Id: I4716e71d72b2526fe635079d1b15f623db842c21
2014-06-11 14:24:32 -07:00
Dianne Hackborn
6ee3c4327d Add new facility to have multiple active codenames.
Use this to have both L and KKWT.

Change-Id: I78cd5ed2dcffab9e93030184ba6f9eb9a6a3cba5
2014-04-24 16:19:14 -07:00
Dianne Hackborn
56dab18617 It's L, dagnabbit.
Change-Id: Ied4e6fce1464aa5cd012a5e2519df8462ec91b4c
2014-03-05 12:33:44 -08:00
Dianne Hackborn
fc021daaca Fix issue #12939338: Android version showing as 'KKWT'
Thou shalt be...  L!

Change-Id: I53e66eaf64183fbab0b1035cdb376b25abab4879
2014-02-10 13:43:00 -08:00
Justin Koh
303d275591 Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT.
Change PLATFORM_VERSION and PLATFORM_VERSION_CODENAME to KKWT, as discussed.

Change-Id: Ia2d8628c4e9ee6b3cf654c8bdfc966a4af5c573c
2014-02-03 16:26:43 -08:00
Dave Langemak
63ac275378 .1 becomes .2
Change-Id: Ib4208e24e66b05ff441302a817be22ea213eb1df
2013-12-03 15:06:56 -08:00
Dianne Hackborn
b6ab1203fb Just a little .1 makes all the difference in the world.
Change-Id: I4c4d8f507f9e81a632e22612043dc904694c5497
2013-11-14 12:06:49 -08:00
Dianne Hackborn
6a4d333907 So long Key Lime Pie, it was nice knowing you.
Now we are KitKat.

I mean Android 4.4 API 19.

Or whatever.

Bug: 10348975

Change-Id: Ic0fa9c82277bb6d6fb79e6095b5ec0e9eb35a04a
2013-10-03 12:30:00 -07:00
Dianne Hackborn
6198be83d8 Bump up to API 18 to match jbmr2.
Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
2013-04-30 14:47:15 -07:00
Dianne Hackborn
a6e7f28492 Welcome, Key Lime Pie.
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
Dianne Hackborn
aa8c2956c2 You would not believe how much we all love jelly beans.
Seriously.

We looooooove them.

Especially Ryan.

Change-Id: I7ef04f1113147cb86a660c566b0d95d8c55eafd4
2013-02-01 16:51:45 -08:00
Nick Kralevich
cced518b1e It's a new version!
Change-Id: I97ba954c8726ae3b64c43260ce221642d5865c6d
2012-12-12 13:41:54 -08:00
Jean-Baptiste Queru
fb28a3a4e5 resolved conflicts for merge of 0f4e3718 to master
Change-Id: Ib3615c79fdd9839208c2b14bd58d1d08e4ac49b8
2012-12-03 15:05:25 -08:00
Jean-Baptiste Queru
0f4e3718df Merge d2e4c25e
Change-Id: I7d92c594498f6b4c8277d3a54d54b9724da04408
2012-12-03 14:46:37 -08:00
Dianne Hackborn
aa48e74b60 Obviously JB MR1.1 should be Android 4.2.2.
Change-Id: I148817d22d50672a7f204809d11aaf7f0a8af28b
2012-12-03 11:07:37 -08:00
Jean-Baptiste Queru
136383549f Merge f7306051c1
Change-Id: I6a431153832ea069aba269d09ec73b784844ff44
2012-11-19 15:08:59 -08:00
Ed Heyl
efcc8b1c79 bump version to 4.2.1
Change-Id: If8206ec632b4e912433eebdfa4aed8dde8f37cb4
2012-11-19 14:20:48 -08:00
Jean-Baptiste Queru
dde4fc127c Version number for AOSP master - do not merge
Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
2012-11-09 07:46:14 -08:00
Dianne Hackborn
0bc0394688 Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
2012-09-27 15:11:47 -07:00
Jean-Baptiste Queru
1196c82491 am 7159a992: am 4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '7159a992ddcda51c91843a29cd1aa30815bc8370':
  Set the AOSP master to be API level 16
2012-08-14 11:55:19 -07:00
Jean-Baptiste Queru
e46e8603b2 Set the AOSP master to be API level 16
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
2012-08-14 09:07:33 -07:00
Dianne Hackborn
75f4c72320 This branch is now JB MR1 development.
Change-Id: Id0463a82826c0fe4c518559fe40e4d6e088aaad9
2012-07-30 18:32:04 -07:00
Dianne Hackborn
3742983d3b JellyBean is now 4.1.
Change-Id: Ibf2d17e704a01d648e6c9fef774e9806e5e97b9f
2012-05-10 18:57:22 -07:00
Jean-Baptiste Queru
48cf73bd13 Restore AOSP-style version numbers - do not merge
Change-Id: I70e3568a78feed4ff69bcdbf4fe2bd13f5211b4c
2012-05-01 08:48:04 -07:00
Dianne Hackborn
512ce9cb42 You know back when I said this thing about Ice Cream Sandwich MR2?
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
2012-01-25 11:21:37 -08:00
Dianne Hackborn
6e4e1bbbc1 Dev branch for ICS MR2.
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
2011-11-10 15:19:51 -08:00
Dianne Hackborn
b32faad390 MR1 is version 4.1, API 15.
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
2011-11-02 11:37:25 -07:00
Dianne Hackborn
7766ea2884 Let's call MR0 4.0.1.
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
2011-09-21 15:25:37 -07:00
Dianne Hackborn
4d7ddab160 Hello, Android 4.0.
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
2011-09-14 13:52:02 -07:00
Dianne Hackborn
8edd7f9a35 resolved conflicts for merge of 3f72af13 to master
Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c
2011-06-10 14:00:55 -07:00
Dianne Hackborn
3f72af1370 Merge cb5b6d16
Change-Id: I95670014aa3e8b83713169e4f414ef058b15f870
2011-06-10 07:29:48 -07:00
Dianne Hackborn
0b22d93be3 Welcome, Android 3.2.
Change-Id: Iedf0f75a3338aca09647779f3cbfb4a94f615493
2011-06-09 16:40:02 -07:00
Jean-Baptiste Queru
cdef404572 Merge 5d66a07d - do not merge
Change-Id: I787a6d5d5c79e7122ed506cd6d9e373e7d1049f4
2011-05-19 14:30:26 -07:00
Jean-Baptiste Queru
174c15d067 Use actual numbers in version numbers.
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
2011-05-10 08:29:49 -07:00
Dianne Hackborn
22b5d62172 DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
2011-05-09 18:21:14 -07:00
Dianne Hackborn
e4b2178329 Onward and upward! And ice cream for all!
Change-Id: If4f5541e1bac283f4c2f43d6e73e37c124ba7684
2011-03-24 16:59:32 -07:00
Dianne Hackborn
59daa2bc61 It's a new version!
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
2011-03-09 18:20:40 -08:00
The Android Automerger
97f3f08622 resolved conflicts for merge of b5952289 to master
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
2011-01-23 23:34:23 -08:00
The Android Automerger
b5952289e2 resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp
Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
2011-01-23 23:25:47 -08:00
Dianne Hackborn
733ce0d0cc DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
2011-01-23 14:49:02 -08:00