OSDN Git Service
Bart Sears [Tue, 1 Mar 2011 21:56:20 +0000 (13:56 -0800)]
Do not merge: Update version to 3.0.1 for HC MR0
Change-Id: I301a5926ea6c04d1d5c050bb3796be1adf515737
The Android Automerger [Tue, 1 Mar 2011 00:45:59 +0000 (16:45 -0800)]
HRI59
Change-Id: I07931c200ea7d21b7659daf9dab52d9aa2d1e1c3
Doug Zongker [Thu, 17 Feb 2011 23:54:20 +0000 (15:54 -0800)]
read partition length from recovery.fstab
Don't hardcode magical partition behavior in the script generator.
Change-Id: I4aeea022f8a32a7c9f316be2c2514510344ca0e0
android-merger [Fri, 25 Feb 2011 02:43:32 +0000 (18:43 -0800)]
HRI55
Change-Id: Icf178b5cefed188b9beb38c406389ce7238cd6d3
android-merger [Tue, 22 Feb 2011 19:41:51 +0000 (11:41 -0800)]
HRI53
Change-Id: I29c6ae3e9b9100ae33988d9ea59b1cc6e329c6ff
android-merger [Tue, 8 Feb 2011 08:42:53 +0000 (00:42 -0800)]
HRI39
Change-Id: I16ab688b86a62fd58fd85d5fff655c2bdf7b8ac3
The Android Automerger [Sat, 5 Feb 2011 06:26:02 +0000 (22:26 -0800)]
HRI35F
Change-Id: I37d34fd9def2a0d229c1d8c171a02b6e2a8e88c6
The Android Automerger [Sat, 5 Feb 2011 06:25:57 +0000 (22:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 5 Feb 2011 05:55:55 +0000 (21:55 -0800)]
HRI35E
Change-Id: I6841a8c23cab958eca33c07b7afda0a5ab6fdfe9
The Android Automerger [Sat, 5 Feb 2011 05:55:41 +0000 (21:55 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 5 Feb 2011 01:36:06 +0000 (17:36 -0800)]
HRI35D
Change-Id: I4459ee17789bfda328f4a8a86e9d166397dca117
The Android Automerger [Sat, 5 Feb 2011 01:35:27 +0000 (17:35 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Fri, 4 Feb 2011 23:14:45 +0000 (15:14 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into honeycomb
Scott Main [Fri, 4 Feb 2011 23:13:04 +0000 (15:13 -0800)]
fix api level filtering script to compare integers, not strings
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
The Android Automerger [Fri, 4 Feb 2011 19:49:14 +0000 (11:49 -0800)]
HRI35C
Change-Id: I8b55811e5be932a5678e370333098ea4b5b081af
The Android Automerger [Fri, 4 Feb 2011 19:49:05 +0000 (11:49 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Fri, 4 Feb 2011 19:47:18 +0000 (11:47 -0800)]
Merge "tweak header css for more distinction" into honeycomb
The Android Automerger [Fri, 4 Feb 2011 18:26:17 +0000 (10:26 -0800)]
HRI35B
Change-Id: I4fcefa65bffcbdbc8b9a822c9ff1202cb32f03d1
The Android Automerger [Fri, 4 Feb 2011 18:26:01 +0000 (10:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Fri, 4 Feb 2011 15:19:22 +0000 (07:19 -0800)]
HRI35
Change-Id: Ie437bcb49855ff9e274b1347c46095a6164a623d
The Android Automerger [Fri, 4 Feb 2011 15:18:51 +0000 (07:18 -0800)]
merge in honeycomb-release history after reset to honeycomb
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
SDK: stub the maps.jar from the google_apis addon.
Depends on change
8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
Scott Main [Fri, 4 Feb 2011 02:11:05 +0000 (18:11 -0800)]
tweak header css for more distinction
Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
The Android Automerger [Thu, 3 Feb 2011 23:26:56 +0000 (15:26 -0800)]
HRI34C
Change-Id: I484d43c6904d0402c377199f9121b64f5dcce986
The Android Automerger [Thu, 3 Feb 2011 23:26:27 +0000 (15:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 19:23:45 +0000 (11:23 -0800)]
HRI34B
Change-Id: Ida85ae69831f125775f9febb1e10b05709adebbe
The Android Automerger [Thu, 3 Feb 2011 19:23:13 +0000 (11:23 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 15:18:24 +0000 (07:18 -0800)]
HRI34
Change-Id: I7529889dfab0eb83adf50f04702fdfe204c14d04
The Android Automerger [Thu, 3 Feb 2011 15:17:24 +0000 (07:17 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Thu, 3 Feb 2011 00:13:51 +0000 (16:13 -0800)]
HRI33B
Change-Id: Id9af3cf2403e828689a04197111a91bfa9277408
The Android Automerger [Thu, 3 Feb 2011 00:12:55 +0000 (16:12 -0800)]
merge in honeycomb-release history after reset to honeycomb
Raphael [Tue, 1 Feb 2011 21:30:00 +0000 (13:30 -0800)]
SDK: Strip llvm-rs-cc in SDK.
SDK Bug:
3394374
Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
Ed Heyl [Wed, 2 Feb 2011 18:03:25 +0000 (10:03 -0800)]
set ID back to honeycomb (please do not merge)
Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
The Android Automerger [Wed, 2 Feb 2011 15:22:12 +0000 (07:22 -0800)]
HRI33
Change-Id: I21fd4355961a33cb301da9781a25e6f8ae4728fe
The Android Automerger [Wed, 2 Feb 2011 15:21:31 +0000 (07:21 -0800)]
merge in honeycomb-release history after reset to honeycomb
Ying Wang [Tue, 1 Feb 2011 22:52:05 +0000 (14:52 -0800)]
Build only userdata.img.
Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user
Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
The Android Automerger [Tue, 1 Feb 2011 18:12:45 +0000 (10:12 -0800)]
HRI32
Change-Id: I1b41dfa2e418c95353f96d2349d2ba95fa04ddc0
The Android Automerger [Tue, 1 Feb 2011 18:12:02 +0000 (10:12 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Tue, 1 Feb 2011 01:51:13 +0000 (17:51 -0800)]
Merge "docs: modify style for toggle stuff so text isn't blue" into honeycomb
The Android Automerger [Tue, 1 Feb 2011 01:24:52 +0000 (17:24 -0800)]
HRI31
Change-Id: Ic80eb5c2ed8651acbb0bd044f7b8c4051e988555
The Android Automerger [Tue, 1 Feb 2011 01:24:27 +0000 (17:24 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Tue, 1 Feb 2011 01:24:07 +0000 (17:24 -0800)]
docs: modify style for toggle stuff so text isn't blue
Change-Id: Ief363bf67d4e0c0fc1a8e79d4b02474c475c88ac
Brett Chabot [Mon, 31 Jan 2011 21:42:11 +0000 (13:42 -0800)]
Merge "Add cts-tradefed to cts build." into honeycomb
Brett Chabot [Sun, 30 Jan 2011 23:07:21 +0000 (15:07 -0800)]
Add cts-tradefed to cts build.
Bug
3403768
Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
The Android Automerger [Sun, 30 Jan 2011 21:37:59 +0000 (13:37 -0800)]
HRI30B
Change-Id: I44ac85e43b36060cc930fb1895f5fc5d11ca80d9
The Android Automerger [Sun, 30 Jan 2011 21:37:32 +0000 (13:37 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Open Source Project [Sun, 30 Jan 2011 20:39:46 +0000 (12:39 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
The Android Automerger [Sun, 30 Jan 2011 17:59:21 +0000 (09:59 -0800)]
HRI30
Change-Id: Ibe7f4b34c88f6b2c749a53a4e13b0ad080c1fbb0
The Android Automerger [Sun, 30 Jan 2011 17:58:47 +0000 (09:58 -0800)]
merge in honeycomb-release history after reset to honeycomb
Scott Main [Sat, 29 Jan 2011 18:29:38 +0000 (10:29 -0800)]
am
05d14cb9: (-s ours) 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
* commit '
05d14cb9f03044e11f7c056dae1e576bb5cd3716':
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)
Dianne Hackborn [Sat, 29 Jan 2011 17:27:44 +0000 (09:27 -0800)]
am
50738779: (-s ours) DO NOT MERGE Fix issue #
3373438: Update GBMR versions
* commit '
50738779d90970a3e36fe40a78df724946f323db':
DO NOT MERGE Fix issue #
3373438: Update GBMR versions
Eric Fischer [Sat, 29 Jan 2011 17:27:42 +0000 (09:27 -0800)]
am
54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit '
54a6b731da4029237410f04c1b6cb9b64bf2783f':
Flesh out the languages_full list with recently added locales.
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:27:39 +0000 (09:27 -0800)]
am
a4781e86: Merge from open-source gingerbread
* commit '
a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
Jean-Baptiste Queru [Sat, 29 Jan 2011 17:24:41 +0000 (09:24 -0800)]
Merge
66888a7c from gingerbread
Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
Ying Wang [Sat, 29 Jan 2011 17:01:14 +0000 (09:01 -0800)]
am
a712543e: Don\'t prepend ./ before the dirs to be removed
* commit '
a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
Don't prepend ./ before the dirs to be removed
The Android Automerger [Fri, 28 Jan 2011 23:49:31 +0000 (15:49 -0800)]
HRI28B
Change-Id: I1c709b0f072e99b82646df535c99da6aa58f4d23
The Android Automerger [Fri, 28 Jan 2011 23:49:02 +0000 (15:49 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Fri, 28 Jan 2011 15:25:32 +0000 (07:25 -0800)]
HRI28
Change-Id: Ia90deb4a27c875930e77db755833fcfb353aaa98
The Android Automerger [Fri, 28 Jan 2011 15:25:00 +0000 (07:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Fri, 28 Jan 2011 00:51:49 +0000 (16:51 -0800)]
HRI27C
Change-Id: I9f8fe45994aecb0a2bb5320f854066bae44f57b5
android-merger [Thu, 27 Jan 2011 22:20:54 +0000 (14:20 -0800)]
HRI27B
Change-Id: Ie3b5f4b104d246fa2a56c58f80882cfbc9665fb4
Doug Zongker [Thu, 27 Jan 2011 18:32:16 +0000 (10:32 -0800)]
Merge "fix check_target_files_signatures" into honeycomb
Doug Zongker [Thu, 27 Jan 2011 18:20:27 +0000 (10:20 -0800)]
fix check_target_files_signatures
common.UnzipTemp now returns a 2-tuple instead of just a string.
Bug:
3398407
Change-Id: Ifd0408283aaa15752caa549f4510a0a3db03c3fd
The Android Automerger [Thu, 27 Jan 2011 15:26:23 +0000 (07:26 -0800)]
HRI27
Change-Id: Id8c5b8cd9a6faf43d2c290ebbb4b83727316d473
The Android Automerger [Thu, 27 Jan 2011 15:26:04 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Thu, 27 Jan 2011 02:28:49 +0000 (18:28 -0800)]
HRI26C
Change-Id: If28fab7659c3dd412f99413386e7fc286e993c33
Brian Carlstrom [Wed, 26 Jan 2011 23:09:47 +0000 (15:09 -0800)]
Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Bug:
3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
android-merger [Wed, 26 Jan 2011 21:38:36 +0000 (13:38 -0800)]
HRI26B
Change-Id: I4999d429bae6d51b4b75b1eb98eca24e0b6554c7
The Android Automerger [Wed, 26 Jan 2011 15:26:49 +0000 (07:26 -0800)]
HRI26
Change-Id: Id6670e04fbb786619fee7614d4ba08269b957a22
The Android Automerger [Wed, 26 Jan 2011 15:26:10 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Wed, 26 Jan 2011 01:14:27 +0000 (17:14 -0800)]
HRI25B
Change-Id: I0012ecfbf0edbc04ee00ac3271a46d31d554cf76
Doug Zongker [Wed, 26 Jan 2011 01:03:34 +0000 (17:03 -0800)]
support use of prebuilt bootable images
img_from_target_files now, with the -z flag, will produce an output
zip with only the bootable partitions (boot and recovery).
img_ and ota_from_target_files can take, instead of a simple
"target_files.zip", a name of the form
"target_files.zip+bootable_images.zip", where the second zip contains
bootable images that should be used instead of building them from the
target_files.zip. (This should be the zip produced by the above -z
flag, perhaps with the images messed with in some way, such as by an
unnamed OEM's extra signature wrapper for their "secure boot"
process.)
Bug:
3391371
Change-Id: Iaf96dfc8f30e806ae342dcf3241566e76ae372d4
Sriram Raman [Tue, 25 Jan 2011 20:45:10 +0000 (15:45 -0500)]
Robert Greenwalt [Tue, 25 Jan 2011 00:32:18 +0000 (16:32 -0800)]
Fix SDK connectivity.
Re-add the phone apk to the sdk build.
bug:
3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
The Android Automerger [Tue, 25 Jan 2011 15:27:38 +0000 (07:27 -0800)]
HRI25
Change-Id: I82d436484964e02a28c339a76e22d0e3a913c207
The Android Automerger [Tue, 25 Jan 2011 15:25:01 +0000 (07:25 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Tue, 25 Jan 2011 01:43:21 +0000 (17:43 -0800)]
HRI24B
Change-Id: I5c3fe8e721627ca9b63ec574144e1dc39171fa5e
Robert Greenwalt [Tue, 25 Jan 2011 00:32:18 +0000 (16:32 -0800)]
Fix SDK connectivity.
Re-add the phone apk to the sdk build.
bug:
3380122
Change-Id: I0b011557aba95fbe9be24d4356eddde4b163b80f
The Android Automerger [Mon, 24 Jan 2011 15:22:40 +0000 (07:22 -0800)]
HRI24
Change-Id: I843602a2350a2055cf5e1df207154ab62a8990f8
The Android Automerger [Mon, 24 Jan 2011 15:22:14 +0000 (07:22 -0800)]
merge in honeycomb-release history after reset to honeycomb
Sriram Raman [Mon, 24 Jan 2011 00:23:19 +0000 (19:23 -0500)]
HRI23B
Change-Id: I1d88a65b01075b0b3f48029bde70fb2df1c0721d
Dianne Hackborn [Sun, 23 Jan 2011 22:49:02 +0000 (14:49 -0800)]
DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
The Android Automerger [Sun, 23 Jan 2011 15:22:32 +0000 (07:22 -0800)]
HRI23
Change-Id: I34e71e7a2490a84c254fa522f549608518b61692
The Android Automerger [Sun, 23 Jan 2011 15:21:39 +0000 (07:21 -0800)]
merge in honeycomb-release history after reset to honeycomb
The Android Automerger [Sat, 22 Jan 2011 15:23:29 +0000 (07:23 -0800)]
HRI22
Change-Id: I9ec8b08d9e7313026a2cfd5bad74ffdccb853f0d
The Android Automerger [Sat, 22 Jan 2011 15:23:04 +0000 (07:23 -0800)]
merge in honeycomb-release history after reset to honeycomb
Sriram Raman [Sat, 22 Jan 2011 06:12:23 +0000 (01:12 -0500)]
HRI21D
Change-Id: Ifc156d2af05da2f430ac47816c44a3355f5c22e0
android-merger [Sat, 22 Jan 2011 00:05:12 +0000 (16:05 -0800)]
HRI21C
Change-Id: Iea605e5b709c3c9f558273d78220a0fc594cde42
Amith Yamasani [Fri, 21 Jan 2011 21:59:53 +0000 (13:59 -0800)]
Clean the build.prop so that default notification sound is set properly.
Bug:
3349429
Change-Id: I44450a4cc9acdeffa42340c61088a5964fa6ee0d
android-merger [Fri, 21 Jan 2011 20:50:33 +0000 (12:50 -0800)]
HRI21B
Change-Id: I0ac7811f35b236e19cea4f4748c0c910a8472ff1
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 15:27:10 +0000 (07:27 -0800)]
HRI21
Change-Id: I28b2b6ef76a6ed7fc6df55121abcba8b0108a86b
The Android Automerger [Fri, 21 Jan 2011 15:26:46 +0000 (07:26 -0800)]
merge in honeycomb-release history after reset to honeycomb
android-merger [Fri, 21 Jan 2011 03:12:00 +0000 (19:12 -0800)]
HRI20F
Change-Id: I795cc2f92a08adc613e5678fda99ea888a4c5fc4
android-merger [Fri, 21 Jan 2011 03:01:26 +0000 (19:01 -0800)]
HRI20E
Change-Id: Ie6581509b1cc02b46b12480bcff705dc75ef6e71
android-merger [Fri, 21 Jan 2011 01:34:14 +0000 (17:34 -0800)]
HRI20C
Change-Id: Ide5580e060008c74a37d79ed3ae21d24e66af554
Sriram Raman [Thu, 20 Jan 2011 23:36:48 +0000 (18:36 -0500)]
HRI20B
Change-Id: I93173b2997e7961013f6ed07919333cc3ff3d19b
Brian Swetland [Thu, 20 Jan 2011 23:33:23 +0000 (15:33 -0800)]
fix tiny android build
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
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