OSDN Git Service
The Android Automerger [Wed, 25 May 2011 23:13:53 +0000 (16:13 -0700)]
merge in gingerbread-release history after reset to gingerbread
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
The Android Automerger [Fri, 18 Mar 2011 17:41:43 +0000 (10:41 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 17 Mar 2011 12:44:08 +0000 (05:44 -0700)]
GRI76
Change-Id: I90c73c1202ae5e83048e3b124e6169728c41784e
The Android Automerger [Thu, 17 Mar 2011 12:43:55 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 16 Mar 2011 12:44:00 +0000 (05:44 -0700)]
GRI75
Change-Id: Ib2065b8cd2383fb7e59bdb0eeb7f3d47ca9335dc
The Android Automerger [Wed, 16 Mar 2011 12:43:35 +0000 (05:43 -0700)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Wed, 16 Mar 2011 00:49:04 +0000 (17:49 -0700)]
Merge "Close inherited PIPE before doing work" into gingerbread
The Android Automerger [Tue, 15 Mar 2011 05:34:06 +0000 (22:34 -0700)]
GRI73
Change-Id: I229b4a1545033e023679e59891f45ee83d711c5b
The Android Automerger [Tue, 15 Mar 2011 05:33:42 +0000 (22:33 -0700)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 12 Mar 2011 19:56:32 +0000 (11:56 -0800)]
GRI71
Change-Id: Ifed7da49ef46eb7d1919b410538de304100388a7
The Android Automerger [Sat, 12 Mar 2011 19:56:17 +0000 (11:56 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 11 Mar 2011 18:36:03 +0000 (10:36 -0800)]
GRI70
Change-Id: Ide85a7a7399834ff03052970be03ef20c06812bc
The Android Automerger [Fri, 11 Mar 2011 18:35:26 +0000 (10:35 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 9 Mar 2011 16:54:15 +0000 (08:54 -0800)]
GRI68
Change-Id: I6b352d645eacaf11aea9ac0a9567c4f5c9dab955
The Android Automerger [Wed, 9 Mar 2011 16:53:55 +0000 (08:53 -0800)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Tue, 8 Mar 2011 00:13:32 +0000 (16:13 -0800)]
Dist build.prop in sdk builds.
Change-Id: Id694a11fb644d21a69c89aad0bd6b0fa85aab32d
Ed Heyl [Tue, 8 Mar 2011 20:35:20 +0000 (12:35 -0800)]
Merge "version bump for new release (please don't merge)" into gingerbread
Ed Heyl [Tue, 8 Mar 2011 02:05:40 +0000 (18:05 -0800)]
version bump for new release (please don't merge)
Change-Id: I94081a1288da434811a1ddaa8a7b7b5da13d9341
The Android Automerger [Tue, 8 Mar 2011 00:40:20 +0000 (16:40 -0800)]
GRI66
Change-Id: I1f6709ea7aefafbc663b1f43667c67403f7e4b5e
The Android Automerger [Tue, 8 Mar 2011 00:40:06 +0000 (16:40 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 5 Mar 2011 05:56:47 +0000 (21:56 -0800)]
GRI63B
Change-Id: I247933cd417aedabf26d94b8e7323a7a492697de
The Android Automerger [Sat, 5 Mar 2011 05:56:42 +0000 (21:56 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sat, 5 Mar 2011 01:42:12 +0000 (17:42 -0800)]
GRI63
Change-Id: I89b9ce44fb606673eab107752eb9711815f45ae6
The Android Automerger [Sat, 5 Mar 2011 01:41:52 +0000 (17:41 -0800)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Wed, 3 Nov 2010 04:31:47 +0000 (21:31 -0700)]
Only copy once even if the first matched src:dest pair appears more than once.
Change-Id: I476923007dac1174371d6e6526d72182eb6c7243
Ying Wang [Fri, 4 Mar 2011 05:52:08 +0000 (21:52 -0800)]
Drop support for target files with no recovery.fstab.
Change-Id: I099298cfffc2546975732a3bf0df60f96ccbdac4
Meanwhile don't build the ota and update zip files if no recovery.fstab
found.
The Android Automerger [Thu, 3 Mar 2011 22:17:53 +0000 (14:17 -0800)]
GRI62
Change-Id: I5a2705b0234e9eac5170f0fc99cae733f0120ad7
The Android Automerger [Thu, 3 Mar 2011 22:17:42 +0000 (14:17 -0800)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Wed, 23 Feb 2011 23:10:24 +0000 (15:10 -0800)]
GRI54
Change-Id: Ib089f2fc920b01d4f98a1db2cbb88bfd6f1bbdd4
Doug Zongker [Wed, 23 Feb 2011 20:17:29 +0000 (12:17 -0800)]
force inclusion of system log tags in the event-log-tags file
Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
android-merger [Sun, 20 Feb 2011 00:11:15 +0000 (16:11 -0800)]
GRI49C
Change-Id: Id23fa869f4f3d7c1aa45284ce24b3593dc03a522
android-merger [Fri, 18 Feb 2011 19:07:30 +0000 (11:07 -0800)]
GRI49B
Change-Id: I2954e5783283e87c852603dc3511c6b6bba4a282
android-merger [Fri, 18 Feb 2011 16:10:34 +0000 (08:10 -0800)]
GRI49
Change-Id: I8af60ecccd73e25e273ed75ef6665e754e2b18c2
android-merger [Fri, 11 Feb 2011 23:15:17 +0000 (15:15 -0800)]
GRI42
Change-Id: I34f1e58d731f74d8509d354669cccd531b0dd8d4
android-merger [Thu, 10 Feb 2011 01:57:48 +0000 (17:57 -0800)]
GRI40
Change-Id: I8c83ec1dc66cace5e69cdd1a2a81db2bfbe00b96
android-merger [Tue, 8 Feb 2011 21:59:39 +0000 (13:59 -0800)]
GRI39
Change-Id: I0b0cae4d75e86c7472814dd9832caa976eda9783
Scott Main [Fri, 4 Feb 2011 23:11:59 +0000 (15:11 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into gingerbread
Scott Main [Fri, 4 Feb 2011 23:10:33 +0000 (15:10 -0800)]
fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change
8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
The Android Automerger [Thu, 3 Feb 2011 22:24:10 +0000 (14:24 -0800)]
GRI34
Change-Id: I1a01e036d32901189a89f6461d71ff62fd8aea73
The Android Automerger [Thu, 3 Feb 2011 22:24:02 +0000 (14:24 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Feb 2011 02:29:39 +0000 (18:29 -0800)]
GRI33
Change-Id: Ic3dc25764715f2b758259e29a6ee83f0c1612e8d
The Android Automerger [Thu, 3 Feb 2011 02:29:35 +0000 (18:29 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 3 Feb 2011 01:44:56 +0000 (17:44 -0800)]
merge in gingerbread-release history after reset to gingerbread
Brian Swetland [Wed, 2 Feb 2011 23:20:50 +0000 (15:20 -0800)]
fix TINY ANDROID yet again...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
Scott Main [Wed, 2 Feb 2011 04:32:18 +0000 (20:32 -0800)]
cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb
Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
The Android Automerger [Mon, 31 Jan 2011 00:03:26 +0000 (16:03 -0800)]
GRI30
Change-Id: Ifb11e4a3f511fa53b6dd6c5e4caf6f503677faa3
The Android Automerger [Mon, 31 Jan 2011 00:03:10 +0000 (16:03 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Fri, 28 Jan 2011 22:45:17 +0000 (14:45 -0800)]
GRI28
Change-Id: Ibfee5c01c8dfc78cbf8e2a06feb9348b9263c25d
The Android Automerger [Fri, 28 Jan 2011 22:45:03 +0000 (14:45 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Thu, 27 Jan 2011 02:55:34 +0000 (18:55 -0800)]
GRI26B
Change-Id: Ib7e2c85985df1efe54d542f1a85619c24c713509
The Android Automerger [Thu, 27 Jan 2011 02:55:27 +0000 (18:55 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 26 Jan 2011 23:13:08 +0000 (15:13 -0800)]
GRI26
Change-Id: Iee0d10cb3330ebbbc9384d8bc0c972ebb8adb662
The Android Automerger [Wed, 26 Jan 2011 23:13:02 +0000 (15:13 -0800)]
merge in gingerbread-release history after reset to gingerbread
Scott Main [Fri, 21 Jan 2011 20:00:51 +0000 (12:00 -0800)]
Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread
Scott Main [Fri, 21 Jan 2011 19:58:56 +0000 (11:58 -0800)]
don't use the sdkdoc template if the index file is a preview
(the features.html doc is no longer used, so removed check for that also)
Change-Id: I1985b2e48060337030df53c19051ea363cb3b700
The Android Automerger [Fri, 21 Jan 2011 01:21:02 +0000 (17:21 -0800)]
GRI20
Change-Id: I0a2fcb365493cc5cd878819945abb4acb0e4ed59
The Android Automerger [Fri, 21 Jan 2011 01:20:54 +0000 (17:20 -0800)]
merge in gingerbread-release history after reset to gingerbread
Dianne Hackborn [Thu, 20 Jan 2011 20:17:41 +0000 (12:17 -0800)]
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
android-merger [Thu, 20 Jan 2011 07:53:57 +0000 (23:53 -0800)]
Merge branch 'gingerbread-release' into saved-gingerbread-release
android-merger [Thu, 20 Jan 2011 07:15:07 +0000 (23:15 -0800)]
update "both" versions!
Change-Id: Ib5c56161ab00b20f6215960d225dc7fea83f3282
OSDN Git Service
