OSDN Git Service
The Android Automerger [Tue, 20 Sep 2011 17:57:35 +0000 (10:57 -0700)]
GWK74B
Change-Id: Iac19525df3d9f5bfe7d70cb5e09746685fadf81a
Ed Heyl [Tue, 13 Sep 2011 18:35:44 +0000 (11:35 -0700)]
GWK74
Change-Id: Iaeb2ade7b4f6d964ba70f1e9ed8cf9e369db16a3
The Android Automerger [Tue, 13 Sep 2011 00:17:34 +0000 (17:17 -0700)]
GWK73
Change-Id: Ibe4ffed6b257a075bf2665b43b3f064006524ee1
The Android Automerger [Tue, 13 Sep 2011 00:16:28 +0000 (17:16 -0700)]
keep history after reconcile of gingerbread-release
Ed Heyl [Sun, 11 Sep 2011 18:46:10 +0000 (11:46 -0700)]
update platform version
update build id
Change-Id: I3a07e62b50744b7567fd4ba435f2a8528a2f6008
android-merger [Sat, 10 Sep 2011 03:17:36 +0000 (20:17 -0700)]
fix space
Change-Id: I29601b2fd5ec607868374e222031598835549854
android-merger [Sat, 10 Sep 2011 01:37:23 +0000 (18:37 -0700)]
GRK71 again
Change-Id: I4ad2c1583e83f1208ca1c519ea1c03352f335e61
android-merger [Fri, 9 Sep 2011 23:49:33 +0000 (16:49 -0700)]
GRK71 again
Change-Id: Ib5f68df8ad7022dd0760f38e72c8fc3840be92b4
android-merger [Fri, 9 Sep 2011 21:50:09 +0000 (14:50 -0700)]
GRK71
Change-Id: Ia00607e866b1ce3633eb0cc6051c5a9d70bea7f5
android-merger [Wed, 7 Sep 2011 00:36:11 +0000 (17:36 -0700)]
GRK39D
Change-Id: I3801d5534b4f6bbdbd37cefa74f71a35ea5ffa59
The Android Automerger [Fri, 2 Sep 2011 23:55:24 +0000 (16:55 -0700)]
GWK15H
Change-Id: I0f58082949e91e206fd0dce80a37d107ba240454
android-merger [Thu, 1 Sep 2011 19:10:10 +0000 (12:10 -0700)]
GRK39C
Change-Id: I2df91acada778458f61961966aae6f575900e7b6
android-merger [Tue, 30 Aug 2011 16:14:32 +0000 (09:14 -0700)]
GRK39B
Change-Id: Id36268001249167160dc7ea0908ddb85b69515a4
The Android Automerger [Wed, 10 Aug 2011 00:47:42 +0000 (17:47 -0700)]
GWK15G
Change-Id: Ice488cd27f50a2f100e100d659c737d4bcc09f5c
android-merger [Mon, 8 Aug 2011 22:48:36 +0000 (15:48 -0700)]
GRK39
Change-Id: Ia4b60a25edae6e8525710ffd11e30308eb22d0db
android-merger [Mon, 8 Aug 2011 22:03:14 +0000 (15:03 -0700)]
GRJ90C
Change-Id: I660b1710592f3bdc0847eb5e6b83dabfd2c7e44c
The Android Automerger [Tue, 2 Aug 2011 23:56:15 +0000 (16:56 -0700)]
GWK15F
Change-Id: If34f003efe36006666e68ab39313772257ea1b45
Dan Morrill [Tue, 2 Aug 2011 23:46:38 +0000 (16:46 -0700)]
Updating version to 2.3.7 to reflect some patches.
Change-Id: I6118b41a26a1ea6940758313871eb8ab83ab06a2
The Android Automerger [Tue, 2 Aug 2011 23:52:03 +0000 (16:52 -0700)]
Merge remote branch 'goog/gingerbread-release' into gingerbread-mr4-release
Conflicts:
core/build_id.mk
Change-Id: If3af1b8a02be0eff4373ff62469ccee820ffeb6a
Dan Morrill [Tue, 2 Aug 2011 22:36:05 +0000 (15:36 -0700)]
Bumping version to 2.3.6 to reflect a few patches.
Change-Id: I540a3954c70502e3deac151c642d454c87a3821b
android-merger [Tue, 2 Aug 2011 23:07:09 +0000 (16:07 -0700)]
GRJ90B
Change-Id: I8da7004b84d8f3df0fee126b178d8bcbcb7b6eb1
The Android Automerger [Fri, 29 Jul 2011 20:46:55 +0000 (13:46 -0700)]
GWK15E
Change-Id: I60b7f8f0883594ed648ee1d97c0ac221645fa7a0
The Android Automerger [Mon, 25 Jul 2011 22:56:36 +0000 (15:56 -0700)]
GWK15D
Change-Id: I5db71a9c7d02a03682600ac958b8fcb8d3ae2a57
The Android Automerger [Mon, 25 Jul 2011 18:33:40 +0000 (11:33 -0700)]
GWK15C
Change-Id: I8484258e2dafc03f84c2e8b512f87e4c1ad8f3fe
The Android Automerger [Wed, 20 Jul 2011 15:33:57 +0000 (08:33 -0700)]
GWK15B
Change-Id: Ic5b7128218c8d7a20b85b5208b158f7901b6ac20
The Android Automerger [Wed, 20 Jul 2011 07:27:31 +0000 (00:27 -0700)]
Set BUILD_ID to GWK15B.
Change-Id: Ia4cd9cba4771c2793afb1d4812157719437b0662
The Android Automerger [Fri, 15 Jul 2011 21:55:43 +0000 (14:55 -0700)]
GWK15
Change-Id: Ie8bb113d5c260d11a662c5fcc74b46bcab4a90ad
The Android Automerger [Fri, 15 Jul 2011 05:26:02 +0000 (22:26 -0700)]
GWK14B
Change-Id: I26218c911d10efd23801652459887583ab389a05
The Android Automerger [Thu, 14 Jul 2011 23:16:30 +0000 (16:16 -0700)]
GWK14
Change-Id: Idd736ac92e1dc000148f7124015ab75e40533707
Ed Heyl [Thu, 30 Jun 2011 21:32:36 +0000 (14:32 -0700)]
new branch, new versions
Change-Id: Ibdd0ba5cc00e4de40855e99ff91543e39b5a64b3
android-merger [Wed, 29 Jun 2011 18:16:15 +0000 (11:16 -0700)]
GRJ90
Change-Id: I76536224052c1e921ac7887bd772bcdf725f36b2
android-merger [Fri, 24 Jun 2011 18:18:22 +0000 (11:18 -0700)]
GRJ85
Change-Id: I5f70ae7fcc5f1ff98c050d9e1a3a819fc2acbbfa
android-merger [Tue, 21 Jun 2011 17:37:59 +0000 (10:37 -0700)]
GRJ82
Change-Id: If9df26a746f9a2236e1234afd06dcbf0782f4dd0
The Android Automerger [Fri, 17 Jun 2011 00:29:55 +0000 (17:29 -0700)]
GRJ77
Change-Id: I5b8077b73d938922e1febc5a1b30c302291f01e3
The Android Automerger [Fri, 17 Jun 2011 00:29:20 +0000 (17:29 -0700)]
merge in gingerbread-release history after reset to gingerbread
Dan Morrill [Thu, 16 Jun 2011 20:43:50 +0000 (13:43 -0700)]
Adding a cleanspec to pick up version change. Do not merge.
Change-Id: I4853ae86488164400d7a0203614b9e87515f6e61
Ed Heyl [Thu, 16 Jun 2011 20:08:09 +0000 (13:08 -0700)]
Merge "add ANDROID_HOST_OUT to env (please do not merge)" into gingerbread
android-merger [Fri, 10 Jun 2011 22:04:31 +0000 (15:04 -0700)]
GRJ71B
Change-Id: I7cc782c78cf18df07949011ef9427063cafa3c94
The Android Automerger [Fri, 10 Jun 2011 21:57:26 +0000 (14:57 -0700)]
GRJ71
Change-Id: I7d5674396d8792e21cc3b39532abf895b48f46a0
The Android Automerger [Fri, 10 Jun 2011 21:57:20 +0000 (14:57 -0700)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Thu, 9 Jun 2011 20:55:16 +0000 (13:55 -0700)]
GRJ70B
Change-Id: I4142cfae1378d46c6ee9ae795bcf21af91039505
The Android Automerger [Thu, 9 Jun 2011 20:45:46 +0000 (13:45 -0700)]
GRJ70
Change-Id: If43e3bcca9e61825d1a7f3287b233d1e9f5e32ad
The Android Automerger [Thu, 9 Jun 2011 20:45:18 +0000 (13:45 -0700)]
merge in gingerbread-release history after reset to gingerbread
Dan Morrill [Thu, 9 Jun 2011 20:20:55 +0000 (13:20 -0700)]
Update version to 2.3.5.
Change-Id: I310c09c6f2d1c0e0067bf4a44bed5958664c1591
Ed Heyl [Tue, 7 Jun 2011 19:02:51 +0000 (12:02 -0700)]
add ANDROID_HOST_OUT to env (please do not merge)
Change-Id: Iddc61e1f93e13a3884b919638da1c24271dd6ca5
android-merger [Mon, 6 Jun 2011 22:18:47 +0000 (15:18 -0700)]
GRJ67B
Change-Id: I73742ebdf6e60ddf7fe40605e4f50b7188e082b9
The Android Automerger [Mon, 6 Jun 2011 22:00:39 +0000 (15:00 -0700)]
GRJ67
Change-Id: I034d285ebaaa4e88f08c1f29cdbf41f837d9aeb3
The Android Automerger [Mon, 6 Jun 2011 22:00:32 +0000 (15:00 -0700)]
merge in gingerbread-release history after reset to gingerbread
Jean-Baptiste Queru [Wed, 1 Jun 2011 20:27:30 +0000 (13:27 -0700)]
Reconcile with gingerbread-mr2-release
Change-Id: I98de118c52ed658a448c2e885a481eece75257a3
Jean-Baptiste Queru [Wed, 1 Jun 2011 14:42:07 +0000 (07:42 -0700)]
Merge from open-source gingerbread
Change-Id: I417fc97191a14102617c0a87718bb690a1944e8b
Ed Heyl [Tue, 31 May 2011 21:05:14 +0000 (14:05 -0700)]
GT the gingerbread-mr2-release branch
Change-Id: I22d6f9759fada4d7970dc915119345eb3fba24d4
Jean-Baptiste Queru [Tue, 31 May 2011 21:03:21 +0000 (14:03 -0700)]
Merge "Relax the constraint of 64bit build environment." into gingerbread
android-merger [Fri, 27 May 2011 21:54:02 +0000 (14:54 -0700)]
GRJ57B
Change-Id: I6a8c336ae35c80128b2c2c7218daa39b7cb226b0
android-merger [Fri, 27 May 2011 21:35:35 +0000 (14:35 -0700)]
GRJ57
Change-Id: I88bed3c222969a0fa5f6bfa5510772ab47cb68a3
android-merger [Fri, 27 May 2011 04:46:56 +0000 (21:46 -0700)]
GRJ56B
Change-Id: If91d5be2c6eb6a28e5e46688f10c34bd0fb47b93
The Android Automerger [Fri, 27 May 2011 04:28:36 +0000 (21:28 -0700)]
GRJ56
Change-Id: I82f3b91ab1b876bd942ef43959fe978949c95bbc
The Android Automerger [Fri, 27 May 2011 04:28:32 +0000 (21:28 -0700)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.
Change-Id: I11450310144cb8d7f127c427ada4a0589e030843
The Android Automerger [Wed, 25 May 2011 23:14:27 +0000 (16:14 -0700)]
GRJ55
Change-Id: Ie75ba136457e19223f1a0ca3be7dba1379e9f20f
The Android Automerger [Wed, 25 May 2011 23:13:53 +0000 (16:13 -0700)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Tue, 24 May 2011 22:46:15 +0000 (15:46 -0700)]
Relax the constraint of 64bit build environment.
Change-Id: Id8be221dcfa07651a4d9a2776b00e907b4ff750e
The Android Automerger [Fri, 13 May 2011 21:27:49 +0000 (14:27 -0700)]
GRJ43
Change-Id: I17c44f6b0635c30509d8c91e16ee6dcfc6f12a6f
The Android Automerger [Fri, 13 May 2011 21:27:38 +0000 (14:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
T.R. Fullhart [Tue, 10 May 2011 00:54:01 +0000 (17:54 -0700)]
GRJ39
Change-Id: Ia991a6c0512267d7928747cd41900201f8785879
android-merger [Thu, 5 May 2011 20:07:24 +0000 (13:07 -0700)]
GRJ35
Change-Id: I6cc9e3c61eef4cb56142fdfe6f7cac3434f81a7b
android-merger [Fri, 22 Apr 2011 20:33:54 +0000 (13:33 -0700)]
GRJ22
Change-Id: Icaedff8a1d030a3158d54432b67ab7bfbf652e87
android-merger [Tue, 19 Apr 2011 03:21:13 +0000 (20:21 -0700)]
GRJ18
Change-Id: Ic678f32d80fb63535ce9b214eb7487d27ce1ecf0
android-merger [Thu, 7 Apr 2011 00:46:20 +0000 (17:46 -0700)]
GRJ06D
Change-Id: I6737dfa3412c2b5243da7e70e7be280278e93d4b
android-merger [Wed, 6 Apr 2011 22:13:37 +0000 (15:13 -0700)]
GRJ06C
Change-Id: I03ff8ac2d4c7e5edaa05b649d2ddaf226f8c118a
modified: core/build_id.mk
android-merger [Wed, 6 Apr 2011 20:41:44 +0000 (13:41 -0700)]
GRJ06
Change-Id: I5c400ad59e7a982a79bac91095157fec44569458
The Android Automerger [Fri, 1 Apr 2011 20:28:39 +0000 (13:28 -0700)]
GRJ01
Change-Id: Ifac185d6a3aa4fa9d7486490acf6eded6ca05d9f
The Android Automerger [Fri, 1 Apr 2011 20:27:48 +0000 (13:27 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 31 Mar 2011 01:33:08 +0000 (18:33 -0700)]
GRI89
Change-Id: I49d20526f59d138207dc0f910c9963621604dcc4
The Android Automerger [Thu, 31 Mar 2011 01:32:55 +0000 (18:32 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 23:31:32 +0000 (16:31 -0700)]
GRI87B
Change-Id: I9c4a72a9abe827c67b26c0225ade79e4d3e57cc7
The Android Automerger [Mon, 28 Mar 2011 23:31:15 +0000 (16:31 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 28 Mar 2011 12:44:18 +0000 (05:44 -0700)]
GRI87
Change-Id: I81d3c7a3d563a7bc37c51afbd4eac05819a4ad42
The Android Automerger [Mon, 28 Mar 2011 12:43:55 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 26 Mar 2011 05:26:09 +0000 (22:26 -0700)]
GRI84C
Change-Id: I2d005428d7998617eee3326ec100e0ee5623f0d4
The Android Automerger [Sat, 26 Mar 2011 05:25:42 +0000 (22:25 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 21:32:48 +0000 (14:32 -0700)]
GRI84B
Change-Id: Ic0ac25ceec832c97c670ab1b3bf96afcfdec2f27
The Android Automerger [Fri, 25 Mar 2011 21:32:09 +0000 (14:32 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 25 Mar 2011 13:05:02 +0000 (06:05 -0700)]
GRI84
Change-Id: I34dd0c3772e3a50a53bbc6e1eebf204800c0d733
The Android Automerger [Fri, 25 Mar 2011 13:04:36 +0000 (06:04 -0700)]
merge in gingerbread-release history after reset to gingerbread
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Merge
c4d4731b4dd306b74b9e2245b4983b6b3c5b866e: 'Build SDK repository'. Do not merge.
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.
Change-Id: I863ac8baf159432d7c95df46cba6e4f3b9122629
The Android Automerger [Thu, 24 Mar 2011 15:49:24 +0000 (08:49 -0700)]
GRI83
Change-Id: Icf7346d2fd48ce3620c342cb752f421b2e676871
The Android Automerger [Thu, 24 Mar 2011 15:49:04 +0000 (08:49 -0700)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Wed, 12 Jan 2011 19:12:06 +0000 (11:12 -0800)]
Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.
Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
Fix dependency of prebuilt target non-static Java libraries.
Cherry-picked from Honeycomb to fix a dependency issue when building
prebuilt shared library.
Change-Id: I0a9cd3835b50dcc130a5f211e89d6bd22478fd42
The Android Automerger [Wed, 23 Mar 2011 12:43:40 +0000 (05:43 -0700)]
GRI82
Change-Id: Ib3ab87e89806a559175d1cf7dfa7177d39a1e453
The Android Automerger [Wed, 23 Mar 2011 12:43:20 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 20:10:47 +0000 (13:10 -0700)]
GRI81B
Change-Id: I3da48c23a15b29e4feb388432a7e65ec7d034a40
The Android Automerger [Tue, 22 Mar 2011 20:10:28 +0000 (13:10 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 22 Mar 2011 12:43:50 +0000 (05:43 -0700)]
GRI81
Change-Id: Id945d0ef9c887eac896a19943227750ddd0c5132
The Android Automerger [Tue, 22 Mar 2011 12:43:23 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 21 Mar 2011 12:42:52 +0000 (05:42 -0700)]
GRI80
Change-Id: I147615889d4c9d6648448aa88f95235ed85ad720
The Android Automerger [Mon, 21 Mar 2011 12:42:26 +0000 (05:42 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 19 Mar 2011 00:35:49 +0000 (17:35 -0700)]
GRI77B
Change-Id: Ib20660e0a4e29dfbebdc4c3aef06da4c7771a5a5
The Android Automerger [Sat, 19 Mar 2011 00:35:28 +0000 (17:35 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 18 Mar 2011 17:42:10 +0000 (10:42 -0700)]
GRI77
Change-Id: Idbde2b12aaca1df187995ad6c0c03b0a15992b0d