OSDN Git Service
The Android Automerger [Wed, 1 Jun 2011 20:12:12 +0000 (13:12 -0700)]
HTJ62B
Change-Id: Ibda60ed391f4b579f53cb01456140d3e3044d584
The Android Automerger [Wed, 1 Jun 2011 14:10:27 +0000 (07:10 -0700)]
HTJ62
Change-Id: If3aada3c898f34fefba87fb0b078fb9261c01d43
The Android Automerger [Wed, 1 Jun 2011 14:10:21 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 31 May 2011 18:42:14 +0000 (11:42 -0700)]
HTJ61B
Change-Id: Ib02f4934b0288205d18fe4509023c91a8fa539ff
The Android Automerger [Tue, 31 May 2011 14:09:42 +0000 (07:09 -0700)]
HTJ61
Change-Id: I754599d3010650ee2e9882b43600add6d0a8c7bb
The Android Automerger [Tue, 31 May 2011 14:09:35 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 30 May 2011 14:10:23 +0000 (07:10 -0700)]
HTJ60
Change-Id: If1681ab7490f9d85dc6f98489d4d6e9dd94e1ea7
The Android Automerger [Mon, 30 May 2011 14:10:19 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Ying Wang [Thu, 26 May 2011 00:16:22 +0000 (17:16 -0700)]
Support custom RenderScript compiler
Change-Id: I85e38e84565e04f99dd26217f280274883dc322d
Scott Main [Fri, 27 May 2011 17:18:14 +0000 (10:18 -0700)]
Merge "docs: adjust sdk page to show/hide messages based on whether online or offline docs mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08" into honeycomb-mr2
Scott Main [Fri, 27 May 2011 16:52:19 +0000 (09:52 -0700)]
docs: adjust sdk page to show/hide messages based on whether online or offline docs
mutually dependent on Change-Id: Ie7490973001530098d5001d9ef5e4dbfab86ed08
Change-Id: I15658c0868c755947207cb8d6391b6aed4c90e14
The Android Automerger [Fri, 27 May 2011 14:09:26 +0000 (07:09 -0700)]
HTJ57
Change-Id: Ie53ad340a44494f28e5f143679960e5447c7a42b
The Android Automerger [Fri, 27 May 2011 14:09:21 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Ying Wang [Thu, 26 May 2011 22:59:56 +0000 (15:59 -0700)]
Support to run dex-preopt on prebuilt apks.
Change-Id: Ic7c40c502934d7588166f26bbb6e2f235d1efdea
The Android Automerger [Thu, 26 May 2011 22:12:52 +0000 (15:12 -0700)]
HTJ56B
Change-Id: I3aa8d9029be518c6e8f9f53e3734fb90702cc590
The Android Automerger [Thu, 26 May 2011 22:12:45 +0000 (15:12 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 26 May 2011 14:10:24 +0000 (07:10 -0700)]
HTJ56
Change-Id: I48e00e5d55ab5ec58f3564148c6f111111c6527e
The Android Automerger [Thu, 26 May 2011 14:10:19 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 25 May 2011 14:09:43 +0000 (07:09 -0700)]
HTJ55
Change-Id: Ie9115674c0f9a5868c86bc684f7a28b8163da2b8
The Android Automerger [Wed, 25 May 2011 14:09:27 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 24 May 2011 19:35:57 +0000 (12:35 -0700)]
HTJ54B
Change-Id: Ida22b6847b1754a41435fef451c83930ccdcbc29
The Android Automerger [Tue, 24 May 2011 14:09:42 +0000 (07:09 -0700)]
HTJ54
Change-Id: If2f887ed2b0db4b233824109ec7f5dd1c25f8709
The Android Automerger [Tue, 24 May 2011 14:09:36 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Mon, 23 May 2011 21:50:13 +0000 (14:50 -0700)]
HTJ53B
Change-Id: I4130fdccb922cf0a11e6c4a61cc87f974f6ef9c6
The Android Automerger [Mon, 23 May 2011 14:09:14 +0000 (07:09 -0700)]
HTJ53
Change-Id: I4f136f662bde95cba9106f17ca108fdcf6a8526c
The Android Automerger [Mon, 23 May 2011 14:09:03 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 20 May 2011 21:28:01 +0000 (14:28 -0700)]
HTJ50B
Change-Id: If94fd99c40573e9d0ed8cf4fc087275c24bfb03e
The Android Automerger [Fri, 20 May 2011 21:27:53 +0000 (14:27 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 20 May 2011 14:09:02 +0000 (07:09 -0700)]
HTJ50
Change-Id: I3db4ee9078094fe2ca1bdcee52b7c34e4efb8d85
The Android Automerger [Fri, 20 May 2011 14:08:58 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 19 May 2011 14:08:43 +0000 (07:08 -0700)]
HTJ49
Change-Id: I1178be6de8832ff8febc6e466f4b4b3a92d487da
The Android Automerger [Thu, 19 May 2011 14:08:38 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 18 May 2011 14:09:16 +0000 (07:09 -0700)]
HTJ48
Change-Id: I1f032567bfd8c8e07c39cfd3be7ea296076903b6
The Android Automerger [Wed, 18 May 2011 14:09:12 +0000 (07:09 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 17 May 2011 14:08:46 +0000 (07:08 -0700)]
HTJ47
Change-Id: I6ff5d200c839b8478f0f68e80d5a9e153356be9b
The Android Automerger [Tue, 17 May 2011 14:08:42 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Scott Main [Mon, 16 May 2011 19:17:20 +0000 (12:17 -0700)]
am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
faf8baaff126aec214608acb9107c20066e0cb00':
docs: make featured video titles smaller so they don't line wrap
Scott Main [Mon, 16 May 2011 19:12:58 +0000 (12:12 -0700)]
docs: make featured video titles smaller so they don't line wrap
Change-Id: I5f4dc06e467a30b579c2710ac1d96a350ef77ff2
The Android Automerger [Mon, 16 May 2011 14:11:03 +0000 (07:11 -0700)]
HTJ46
Change-Id: I0c3df08c5264a4bf80edb4c35e309ac2d8a7a7e1
The Android Automerger [Mon, 16 May 2011 14:10:58 +0000 (07:10 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 13 May 2011 14:08:24 +0000 (07:08 -0700)]
HTJ43
Change-Id: I05fe223f0d9058eacfc2c5b05c5701e3413a96fa
The Android Automerger [Fri, 13 May 2011 14:08:20 +0000 (07:08 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 12 May 2011 14:08:03 +0000 (07:08 -0700)]
HTJ42
Change-Id: I774abd20009d2b0ff5dd2a50eb6549d1f4ca2d9b
The Android Automerger [Thu, 12 May 2011 14:07:59 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Wed, 11 May 2011 14:02:39 +0000 (07:02 -0700)]
HTJ41
Change-Id: I2feded7a9ad0af9fc69ac4ca595a3401f2069128
The Android Automerger [Wed, 11 May 2011 14:02:35 +0000 (07:02 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Tue, 10 May 2011 14:07:46 +0000 (07:07 -0700)]
HTJ40
Change-Id: I69a397254764b50a6ecf793c5012ecae6fb4c956
The Android Automerger [Tue, 10 May 2011 14:07:34 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
Dianne Hackborn [Tue, 10 May 2011 01:21:14 +0000 (18:21 -0700)]
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
The Android Automerger [Mon, 9 May 2011 14:07:37 +0000 (07:07 -0700)]
HTJ39
Change-Id: Ie5a62cd1e0cba4e66e53601d797ebd46a444615b
The Android Automerger [Mon, 9 May 2011 14:07:21 +0000 (07:07 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Fri, 6 May 2011 14:56:24 +0000 (07:56 -0700)]
HTJ36
Change-Id: Idcf387b729e2e6c9091ff4e1325a4a5f73866317
The Android Automerger [Fri, 6 May 2011 14:56:12 +0000 (07:56 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 5 May 2011 16:51:24 +0000 (09:51 -0700)]
HTJ35
Change-Id: I7bfb6a0fcaba84e6475bcb212e91bedc6edd333a
The Android Automerger [Thu, 5 May 2011 16:51:18 +0000 (09:51 -0700)]
merge in honeycomb-mr2-release history after reset to honeycomb-mr2
The Android Automerger [Thu, 5 May 2011 16:39:50 +0000 (09:39 -0700)]
HT = hc mr2
Change-Id: I3d9bdd1eed2ddb6ff2e6b09da756316b4805f6c7
Scott Main [Fri, 1 Apr 2011 23:19:26 +0000 (16:19 -0700)]
am
63e2c1eb: docs: add Google IO 2011 logo
* commit '
63e2c1eba8079caa3288a14041239f7b5018ee92':
docs: add Google IO 2011 logo
Scott Main [Fri, 1 Apr 2011 22:05:12 +0000 (15:05 -0700)]
docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
Ying Wang [Tue, 29 Mar 2011 18:47:12 +0000 (11:47 -0700)]
Support to build renderscript in unbundled apps.
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
Brett Chabot [Fri, 25 Mar 2011 02:02:44 +0000 (19:02 -0700)]
am
dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit '
dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
Manual cherry pick of build more sdklib tests.
Brett Chabot [Thu, 24 Mar 2011 05:23:27 +0000 (22:23 -0700)]
Manual cherry pick of build more sdklib tests.
Original description from open master:
-----------
Add more sdk lib tests to sdk build.
Also fix whitespace issues introduced by last commit.
Change-Id: Ifdede823b99b210ad6a48513e8522b4f660537cf
Raphael Moll [Thu, 24 Mar 2011 17:04:06 +0000 (10:04 -0700)]
Raphael Moll [Thu, 24 Mar 2011 16:54:38 +0000 (09:54 -0700)]
Merge "Merge
960ad4e0952da55943591098ea74827de921d303 from master_open." into honeycomb
Brett Chabot [Thu, 24 Mar 2011 05:18:26 +0000 (22:18 -0700)]
am
d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit '
d42aadb1ebbc1aef1551b4aa4c525ef54cd5433d':
Add ddmlib-tests.jar to sdk build.
Brett Chabot [Wed, 23 Mar 2011 03:38:57 +0000 (20:38 -0700)]
Add ddmlib-tests.jar to sdk build.
Change-Id: Ib681389a1f1e2ead30808cef3c74dd5da9dea4d0
Bruce Beare [Wed, 2 Mar 2011 16:29:59 +0000 (08:29 -0800)]
Merge
960ad4e0952da55943591098ea74827de921d303 from master_open.
Original commit msg:
sdk: Add pc-bios files for IA qemu emulator
Change-Id: I7f66a192975dc201a5f886e6a5e02b0ca9fbdee0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Michel Trivi [Thu, 17 Mar 2011 03:34:31 +0000 (20:34 -0700)]
Merge "Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1
Jean-Michel Trivi [Thu, 17 Mar 2011 00:30:22 +0000 (17:30 -0700)]
Fix bug
4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
Add the new libraries on the system
Change-Id: Ifc7259c45dfb7a4e584a822793811f4119ed5535
Doug Zongker [Wed, 16 Mar 2011 14:49:13 +0000 (07:49 -0700)]
put extra recovery keys in the product definition
Change-Id: I71637cd578b24891c10171aa59406848649be703
Xavier Ducrohet [Tue, 15 Mar 2011 20:28:40 +0000 (13:28 -0700)]
Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
Dianne Hackborn [Thu, 10 Mar 2011 02:19:56 +0000 (18:19 -0800)]
It's a new version!
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
Scott Main [Mon, 7 Mar 2011 18:51:43 +0000 (10:51 -0800)]
am
e8f40264: Merge "docs: update android market icon" into honeycomb
* commit '
e8f402640b278b234594fd68dc5bab4ac94a334e':
docs: update android market icon
Scott Main [Mon, 7 Mar 2011 18:44:54 +0000 (10:44 -0800)]
Merge "docs: update android market icon" into honeycomb
Scott Main [Sat, 5 Mar 2011 17:24:41 +0000 (09:24 -0800)]
am
3ab162e7: docs: script update to account for double-nested list items when scrolling sidenav into view
* commit '
3ab162e71cbe88ec4d2207c39b9f3d2d7f4c965c':
docs: script update to account for double-nested list items when scrolling sidenav into view
Scott Main [Fri, 4 Mar 2011 20:23:00 +0000 (12:23 -0800)]
docs: script update to account for double-nested list items when scrolling sidenav into view
Change-Id: I03668f9ecb7da03a7921a0d7eacd2dcaa0a1ba54
Ying Wang [Fri, 4 Mar 2011 19:28:01 +0000 (11:28 -0800)]
Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." into honeycomb-mr1
Ying Wang [Fri, 4 Mar 2011 19:21:38 +0000 (11:21 -0800)]
Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
Scott Main [Fri, 4 Mar 2011 19:17:24 +0000 (11:17 -0800)]
am
befeb8e5: docs: css tweaks to quickview subrule
* commit '
befeb8e5d54efe9511237e7f5cd99707e1717cb5':
docs: css tweaks to quickview subrule
Ying Wang [Fri, 4 Mar 2011 18:57:51 +0000 (10:57 -0800)]
Merge "Support stl variants when LOCAL_NDK_VERSION is set." into honeycomb-mr1
Ying Wang [Fri, 4 Mar 2011 02:53:53 +0000 (18:53 -0800)]
Support stl variants when LOCAL_NDK_VERSION is set.
LOCAL_NDK_STL_VARIANT can be set to system, stlport_static, stlport_shared
or gnustl_static. It defaults to system.
Change-Id: I2840d30ff732a00bc0ea70eab8a8179aea0abbdf
Scott Main [Fri, 4 Mar 2011 18:18:04 +0000 (10:18 -0800)]
docs: update android market icon
Change-Id: I3659cb6cbeb795debd769efc7245cd14d2a86418
Scott Main [Fri, 4 Mar 2011 17:45:40 +0000 (09:45 -0800)]
docs: css tweaks to quickview subrule
Change-Id: Ib25255c176ed13e8d0bb5edc4172e1629a886125
Scott Main [Fri, 4 Mar 2011 09:21:45 +0000 (01:21 -0800)]
am
75eb14bc: docs: add default margins for form element
* commit '
75eb14bc1c2ae4f46c6d67ec51c1a9e8ed42e25f':
docs: add default margins for form element
Ying Wang [Thu, 3 Mar 2011 21:29:38 +0000 (13:29 -0800)]
Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
Scott Main [Thu, 3 Mar 2011 18:28:02 +0000 (10:28 -0800)]
docs: add default margins for form element
Change-Id: Ibce828e2f22193e1725420e90d4df408646f23dd
Ying Wang [Thu, 3 Mar 2011 05:23:15 +0000 (21:23 -0800)]
Merge "sdk.atree does not need DIST_DIR any longer."
Bart Sears [Wed, 2 Mar 2011 23:33:02 +0000 (15:33 -0800)]
am
84684a5e: (-s ours) am
b67b2f6b: Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb
* commit '
84684a5ead19f53acad8285fe4242a2bc55b5472':
Do not merge: Update version to 3.0.1 for HC MR0
Ying Wang [Wed, 2 Mar 2011 20:54:55 +0000 (12:54 -0800)]
am
1fe8c892: am
65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '
1fe8c89298df6433c2f70b8ae093b90bd12eb760':
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
Wink Saville [Wed, 2 Mar 2011 20:53:40 +0000 (12:53 -0800)]
am
6d85b7c7: am
243d9ae2: am
4d67e916: am
d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '
6d85b7c774d224825f7ecd6e7819499daadc4c78':
WAPPushManager, WAP Push over SMS message handler
Doug Zongker [Wed, 2 Mar 2011 18:57:06 +0000 (10:57 -0800)]
remove vestigial WriteFirmwareImage function
Nothing calls this, and the updater function it calls no longer
exists. The HTC-device-specific thing it used to do was moved to HTC
extension libraries.
Change-Id: I2252adf44ea0c5beb6e9379215d7337880f66f68
Bart Sears [Wed, 2 Mar 2011 02:02:24 +0000 (18:02 -0800)]
am
b67b2f6b: Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb
* commit '
b67b2f6bad2b0348285899d0c85fe8196f6559a5':
Do not merge: Update version to 3.0.1 for HC MR0
Bart Sears [Wed, 2 Mar 2011 02:00:22 +0000 (18:00 -0800)]
Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb
Ying Wang [Wed, 2 Mar 2011 00:13:41 +0000 (16:13 -0800)]
sdk.atree does not need DIST_DIR any longer.
Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
Ying Wang [Tue, 1 Mar 2011 22:56:57 +0000 (14:56 -0800)]
am
65265492: Don\'t clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
* commit '
652654927da52f9d1d0e75b69be44701686f79e7':
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
Ying Wang [Tue, 1 Mar 2011 22:16:58 +0000 (14:16 -0800)]
Don't clean INSTALLED_RADIOIMAGE_TARGET in target/board/Android.mk
We are deprecating use of AndroidBoard.mk. To move add-radio-file to
Android.mk, cleaning INSTALLED_RADIOIMAGE_TARGET may clean the radio
target set by other Android.mks that get included before
target/board/Android.mk.
Bug:
3500660
Change-Id: Iee19c40c18f0e9ec23bad4b6ab0e600756af615a
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
Wink Saville [Tue, 1 Mar 2011 21:48:38 +0000 (13:48 -0800)]
am
243d9ae2: am
4d67e916: am
d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '
243d9ae28ce30dda98bc024794218f1a8b21e85f':
WAPPushManager, WAP Push over SMS message handler
Wink Saville [Tue, 1 Mar 2011 21:16:09 +0000 (13:16 -0800)]
am
4d67e916: am
d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '
4d67e91644ea78b5209de50355ba812a73b519f8':
WAPPushManager, WAP Push over SMS message handler
Wink Saville [Tue, 1 Mar 2011 20:39:42 +0000 (12:39 -0800)]
am
d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '
d09b2e552788cc90813e930e3912651e053c657c':
WAPPushManager, WAP Push over SMS message handler
Raphael Moll [Tue, 1 Mar 2011 19:14:07 +0000 (11:14 -0800)]
Pass DIST_DIR to sdk.atree
Change-Id: I224781b13bfbf11de553d201b4c2214f93235a67