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
Jean-Baptiste Queru
fce88928fe
Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
...
This reverts commit 7e1ce27c08
, reversing
changes made to 7dfc127096
.
Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
2011-01-21 07:50:36 -08:00
Ed Heyl
7e1ce27c08
Merge commit '50738779' into gingerbread-plus-aosp
...
Conflicts:
core/version_defaults.mk
Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
Dianne Hackborn
50738779d9
DO NOT MERGE Fix issue #3373438 : Update GBMR versions
...
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -08:00
Dianne Hackborn
68404ba40e
Bump API version up to 10, thus resource version up to 11.
...
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
2011-01-16 11:07:28 -08:00
Dianne Hackborn
7e41e31038
We. Are. Honeycomb!
...
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
2011-01-06 12:47:43 -08:00
Jean-Baptiste Queru
3463d0e102
resolved conflicts for merge of c1b33081
to gingerbread-plus-aosp - DO NOT MERGE
...
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
2010-12-14 16:12:23 -08:00
Dianne Hackborn
c1b330818e
(DO NOT MERGE) Issue #3255640 : Need to bump GB to API 10 version name "2.4"
...
We are now version 2.4, API 10.
Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
2010-12-14 11:30:43 -08:00
android-merger
0c3d5d9541
2.3.1
...
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
2010-12-09 16:11:38 -08:00
Dianne Hackborn
311c267e15
We are API 9 compatible.
...
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
2010-10-20 18:54:17 -07:00
Dianne Hackborn
8cd3838371
Gingerbread becomes real.
...
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
2010-10-18 11:46:50 -07:00
Dianne Hackborn
79b4be961b
Change version codename.
...
Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
2010-07-27 14:59:24 -07:00
Jean-Baptiste Queru
833e62400e
Update platform version strings for AOSP
...
Change-Id: I47d405646dd2f5179bd0db0a0b360bf5ba0069c1
2010-06-28 09:40:24 -07:00
Ed Heyl
f03c9acfec
fix platform name
...
Change-Id: Ic6507f94887ead4d710a3da85582d49a2d9b8f24
2010-06-11 02:50:18 -07:00
Ed Heyl
1d2c25b780
kraken --> gingerbread
...
Change-Id: I7710134ec026b9c494fe2912809607c162b5ac51
2010-06-11 02:06:03 -07:00
Dianne Hackborn
d6f9929f4a
Mmmmmm... Gingerbread!
...
Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
2010-04-19 15:09:47 -07:00
Dianne Hackborn
cc45ee9c3c
On to Kraken...
...
Change-Id: Ib5f57d8095a0e88fdbbc933ccb2ea0c6d83010ae
2010-04-15 14:06:28 -07:00
Dianne Hackborn
efba0b9829
It's beginning to look a lot like release time!
...
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
2010-04-05 12:33:11 -07:00
Jeff Hamilton
aa2885ed34
Switch the platform name from Eclair-MR2 to Froyo.
2009-12-17 15:25:19 -06:00
Dianne Hackborn
176c758cb4
Change version to MR2 development.
2009-12-03 18:19:53 -08:00
Dianne Hackborn
c3e17966b5
Update version name to 2.1 and API to 7.
...
Change-Id: If922a88c1f3e99553ec5df9b870713eab1c53c54
2009-11-18 17:40:17 -08:00
Dianne Hackborn
f6295cdd82
Fix issue #2258571 : Fix build versions
...
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -08:00
Dianne Hackborn
3fa115999c
Bump version to 2.1 API 6.
...
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -07:00
Dianne Hackborn
ff6f3fe448
Finish issue #2168428 : STOP SHIP: Bump API version to 5.
...
We are now 2.0. Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.
Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Dianne Hackborn
0187d84264
Part of issue #2168428 : STOP SHIP: Bump API version to 5
...
This bumps the API version. We are still going to be an Eclair
development version until prebuilts are updated.
Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
2009-10-06 17:22:49 -07:00
Dianne Hackborn
e34fdc0113
Bump platform version to 4.
...
Not sure why this didn't get integrated from Donut.
2009-08-19 11:00:21 -07:00
The Android Open Source Project
678ea42307
merge 9bd5404a9d
w/conflict
2009-05-18 13:47:57 -07:00
Dianne Hackborn
9bd5404a9d
Use new aapt feature to add default version info to .apks.
2009-05-18 12:41:45 -07:00
Dianne Hackborn
ab1e594c5d
Update build version to Eclair.
2009-05-13 13:21:02 -07:00
Dianne Hackborn
9537884b0d
Add new property for dev codename, update version to Donut.
2009-05-08 13:03:08 -07:00
Sriram Raman
7b64124f0b
Automated import from //branches/donutburger/...@142410,142410
2009-03-24 22:40:59 -07:00
The Android Open Source Project
88b607994a
auto import from //depot/cupcake/@135843
2009-03-03 19:28:42 -08:00
The Android Open Source Project
05806d7af6
auto import from //depot/cupcake/@135843
2009-03-03 18:28:14 -08:00
The Android Open Source Project
475fa12ade
auto import from //branches/cupcake/...@130745
2009-02-10 15:43:57 -08:00
The Android Open Source Project
dcc08f073b
Code drop from //branches/cupcake/...@124589
2008-12-17 18:03:49 -08:00
The Android Open Source Project
b6c1cf6de7
Initial Contribution
2008-10-21 07:00:00 -07:00