OSDN Git Service
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
android-merger [Wed, 19 Jan 2011 22:12:16 +0000 (14:12 -0800)]
Merge branch 'gingerbread-release' into saved-gingerbread-release
Eric Fischer [Tue, 18 Jan 2011 23:33:39 +0000 (15:33 -0800)]
Merge "Flesh out the languages_full list with recently added locales." into gingerbread
android-merger [Mon, 17 Jan 2011 06:06:15 +0000 (22:06 -0800)]
GRH78B
Change-Id: If073900c338d3cc0efa13564315c9b62daaff7e4
The Android Automerger [Mon, 17 Jan 2011 00:22:08 +0000 (16:22 -0800)]
GRI16B
Change-Id: I92f45346261450ef7534ef8857256f5b14fa5177
The Android Automerger [Mon, 17 Jan 2011 00:22:02 +0000 (16:22 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Sun, 16 Jan 2011 16:53:56 +0000 (08:53 -0800)]
GRI16
Change-Id: I1ca93b0bddbff4e6ee6bbbf4f490b8f5a97ad8c5
The Android Automerger [Sun, 16 Jan 2011 16:53:38 +0000 (08:53 -0800)]
merge in gingerbread-release history after reset to gingerbread
Eric Fischer [Fri, 14 Jan 2011 23:23:23 +0000 (15:23 -0800)]
Flesh out the languages_full list with recently added locales.
Change-Id: I8c43feba15f03e0b204b2d3ef136ea6e6e2e4fe2
Jean-Baptiste Queru [Fri, 14 Jan 2011 21:27:31 +0000 (13:27 -0800)]
Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
Jean-Baptiste Queru [Fri, 14 Jan 2011 20:46:35 +0000 (12:46 -0800)]
Merge "CTS: pass vogar expectation location to CollectAllTests." into gingerbread
The Android Automerger [Fri, 14 Jan 2011 15:48:56 +0000 (07:48 -0800)]
GRI14
Change-Id: Ib6a65ca825d7dbb5cf8c30580d577d2fd3ef7030
The Android Automerger [Fri, 14 Jan 2011 15:48:48 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread
Scott Main [Fri, 14 Jan 2011 00:35:51 +0000 (16:35 -0800)]
docs: update the sdk doc template to remove a bunch of obsolete
things and clean up the logic statements for clarity
Change-Id: I75d333370d9e7135abda96c4ef50800f287cea97
The Android Automerger [Thu, 13 Jan 2011 15:48:23 +0000 (07:48 -0800)]
GRI13
Change-Id: I1b9d5f33a02cfbec8150475c2f6d6f0de124abd5
The Android Automerger [Thu, 13 Jan 2011 15:48:17 +0000 (07:48 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 12 Jan 2011 15:21:06 +0000 (07:21 -0800)]
GRI12
Change-Id: I1ed5206a23f913ed14ddb048b70ad2b981c05b00
The Android Automerger [Wed, 12 Jan 2011 15:20:58 +0000 (07:20 -0800)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Tue, 11 Jan 2011 18:03:03 +0000 (10:03 -0800)]
GRI11B
Change-Id: Icfe28b4bca6c45ee4b74d5f0c5db44c5b87c7266
The Android Automerger [Tue, 11 Jan 2011 15:34:54 +0000 (07:34 -0800)]
GRI11
Change-Id: I8cad7593afb22398aa0bbfcca51602302834b72c
The Android Automerger [Tue, 11 Jan 2011 15:34:47 +0000 (07:34 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Mon, 10 Jan 2011 15:39:59 +0000 (07:39 -0800)]
GRI10
Change-Id: I33bea69141575bcadea2c429406f0de1b53d083f
The Android Automerger [Mon, 10 Jan 2011 15:39:45 +0000 (07:39 -0800)]
merge in gingerbread-release history after reset to gingerbread
Brett Chabot [Tue, 14 Dec 2010 22:45:08 +0000 (14:45 -0800)]
CTS: pass vogar expectation location to CollectAllTests.
Bug
3181338
Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
Sriram Raman [Fri, 7 Jan 2011 03:12:59 +0000 (22:12 -0500)]
GRI06B
Change-Id: I658d4d6ea34882867310b033e6b76fa67036d536
The Android Automerger [Fri, 7 Jan 2011 01:24:31 +0000 (17:24 -0800)]
GRI06
Change-Id: Id46b46cd0a7b6ae0fe47139b2e0ba29790f19c85
The Android Automerger [Fri, 7 Jan 2011 01:24:20 +0000 (17:24 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Wed, 5 Jan 2011 15:34:02 +0000 (07:34 -0800)]
GRI05
Change-Id: Ib10b09b6bc331edc5bd3a647104b7b0a1673abb7
The Android Automerger [Wed, 5 Jan 2011 15:33:57 +0000 (07:33 -0800)]
merge in gingerbread-release history after reset to gingerbread
Sriram Raman [Wed, 5 Jan 2011 02:04:01 +0000 (21:04 -0500)]
GRI04B
Change-Id: I9de8cf3331eab6719a42057cd9482e88537ec940
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug:
3321625
Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
Ying Wang [Tue, 4 Jan 2011 20:55:14 +0000 (12:55 -0800)]
Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug:
3321625
Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
The Android Automerger [Tue, 4 Jan 2011 15:19:47 +0000 (07:19 -0800)]
GRI04
Change-Id: Ia9a41aede11366c880666826693227c62c5d836a
The Android Automerger [Tue, 4 Jan 2011 15:19:41 +0000 (07:19 -0800)]
merge in gingerbread-release history after reset to gingerbread
android-merger [Thu, 23 Dec 2010 18:44:10 +0000 (10:44 -0800)]
GRH84
Change-Id: Ic450ec858989dad64de19eb908a39510e2a27bb6
The Android Automerger [Wed, 22 Dec 2010 16:00:47 +0000 (08:00 -0800)]
GRH83
Change-Id: I46ef41050de93d6a1c3ff71a502360712c23ed9f
The Android Automerger [Wed, 22 Dec 2010 16:00:41 +0000 (08:00 -0800)]
merge in gingerbread-release history after reset to gingerbread
The Android Automerger [Tue, 21 Dec 2010 16:31:58 +0000 (08:31 -0800)]
GRH82
Change-Id: I41a6c3c6b01a85068b071f8b7934ce5d535d8474
The Android Automerger [Tue, 21 Dec 2010 16:31:43 +0000 (08:31 -0800)]
merge in gingerbread-release history after reset to gingerbread
Ying Wang [Mon, 20 Dec 2010 19:18:28 +0000 (11:18 -0800)]
Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578
Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
Sriram Raman [Fri, 17 Dec 2010 17:06:52 +0000 (12:06 -0500)]
GRH78
Change-Id: Ie6ad143bd7cd4faf89526bdf90dad22b5b7b6ca7
Sriram Raman [Thu, 16 Dec 2010 22:37:44 +0000 (17:37 -0500)]
GRH77
Change-Id: I2c8b8592b7098e20e76ada49201c8f96326456ac
Jeff Hamilton [Thu, 16 Dec 2010 00:29:40 +0000 (18:29 -0600)]
DO NOT MERGE: The API version changed and a bunch of stuff needs rebuilding, so just wipe $(OUT_DIR).
Change-Id: I7b6c291db3ec09c7b53949a04cc792912004a1de
OSDN Git Service
