Commit Graph

4200 Commits

Author SHA1 Message Date
The Android Automerger c90244568e HTJ39
Change-Id: Ie5a62cd1e0cba4e66e53601d797ebd46a444615b
2011-05-09 07:07:37 -07:00
The Android Automerger 6dc65a66a8 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-09 07:07:21 -07:00
The Android Automerger b9e7e6c7bf HTJ36
Change-Id: Idcf387b729e2e6c9091ff4e1325a4a5f73866317
2011-05-06 07:56:24 -07:00
The Android Automerger 4df0214c5c merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-06 07:56:12 -07:00
The Android Automerger 7f6c96a712 HTJ35
Change-Id: I7bfb6a0fcaba84e6475bcb212e91bedc6edd333a
2011-05-05 09:51:24 -07:00
The Android Automerger 92293e3e22 merge in honeycomb-mr2-release history after reset to honeycomb-mr2 2011-05-05 09:51:18 -07:00
The Android Automerger 6de9e6f932 HT = hc mr2
Change-Id: I3d9bdd1eed2ddb6ff2e6b09da756316b4805f6c7
2011-05-05 09:39:50 -07:00
Scott Main 2218c02711 am 63e2c1eb: docs: add Google IO 2011 logo
* commit '63e2c1eba8079caa3288a14041239f7b5018ee92':
  docs: add Google IO 2011 logo
2011-04-01 16:19:26 -07:00
Scott Main 63e2c1eba8 docs: add Google IO 2011 logo
Change-Id: I0393325205c31f588d1e1fb64dfcc2d4714bdad6
2011-04-01 15:05:12 -07:00
Ying Wang fcf00d53bf Support to build renderscript in unbundled apps.
Change-Id: I8104be723f507df4f9673616bada11fb613651b7
2011-03-29 11:47:12 -07:00
Brett Chabot 50a06fe30e am dd8edfdb: Manual cherry pick of build more sdklib tests.
* commit 'dd8edfdb1ebdc5717357564fe42586d090e2bbe0':
  Manual cherry pick of build more sdklib tests.
2011-03-24 19:02:44 -07:00
Brett Chabot dd8edfdb1e 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
2011-03-24 11:26:29 -07:00
Raphael Moll 9791e6ea17 am 7e58a5fa: Merge "Merge 960ad4e095 from master_open." into honeycomb
* commit '7e58a5fa66f905a4524267cd1a9328d8046b3280':
  Merge 960ad4e095 from master_open.
2011-03-24 10:04:06 -07:00
Raphael Moll 7e58a5fa66 Merge "Merge 960ad4e095 from master_open." into honeycomb 2011-03-24 09:54:38 -07:00
Brett Chabot deab07f31b am d42aadb1: Add ddmlib-tests.jar to sdk build.
* commit 'd42aadb1ebbc1aef1551b4aa4c525ef54cd5433d':
  Add ddmlib-tests.jar to sdk build.
2011-03-23 22:18:26 -07:00
Brett Chabot d42aadb1eb Add ddmlib-tests.jar to sdk build.
Change-Id: Ib681389a1f1e2ead30808cef3c74dd5da9dea4d0
2011-03-23 22:12:41 -07:00
Bruce Beare 66330ac800 Merge 960ad4e095 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>
2011-03-23 15:17:23 -07:00
Jean-Michel Trivi 4361552b21 Merge "Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs" into honeycomb-mr1 2011-03-16 20:34:31 -07:00
Jean-Michel Trivi e410564714 Fix bug 4106199 add the libOpenSLES, libOpenMAXAL, libwilhelm libs
Add the new libraries on the system

Change-Id: Ifc7259c45dfb7a4e584a822793811f4119ed5535
2011-03-16 17:30:22 -07:00
Doug Zongker 5d4808db16 put extra recovery keys in the product definition
Change-Id: I71637cd578b24891c10171aa59406848649be703
2011-03-16 07:52:25 -07:00
Xavier Ducrohet 4216a8c94e Add the host notice file to the SDK platform-tools folder.
Change-Id: Id9e789fed635c6e5b43254f8ef6ec353302ca1be
2011-03-15 13:28:40 -07:00
Dianne Hackborn 59daa2bc61 It's a new version!
Change-Id: Ic0740e3250ad7805188f919cdb0cc63b6aa17423
2011-03-09 18:20:40 -08:00
Scott Main 73b0979941 am e8f40264: Merge "docs: update android market icon" into honeycomb
* commit 'e8f402640b278b234594fd68dc5bab4ac94a334e':
  docs: update android market icon
2011-03-07 10:51:43 -08:00
Scott Main e8f402640b Merge "docs: update android market icon" into honeycomb 2011-03-07 10:44:54 -08:00
Scott Main 2e426cf07c 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
2011-03-05 09:24:41 -08:00
Scott Main 3ab162e71c docs: script update to account for double-nested list items when scrolling sidenav into view
Change-Id: I03668f9ecb7da03a7921a0d7eacd2dcaa0a1ba54
2011-03-04 12:24:54 -08:00
Ying Wang 696e7f916c Merge "Add NDK crtbegin_so.o and crtend_so.o if they exist." into honeycomb-mr1 2011-03-04 11:28:01 -08:00
Ying Wang 7ee6c4033b Add NDK crtbegin_so.o and crtend_so.o if they exist.
Change-Id: I3d49d5a2d0e1b6bf26a0e1df0df2d6d7e026f85a
2011-03-04 11:21:38 -08:00
Scott Main a9c45d1311 am befeb8e5: docs: css tweaks to quickview subrule
* commit 'befeb8e5d54efe9511237e7f5cd99707e1717cb5':
  docs: css tweaks to quickview subrule
2011-03-04 11:17:24 -08:00
Ying Wang 3e1d3c4394 Merge "Support stl variants when LOCAL_NDK_VERSION is set." into honeycomb-mr1 2011-03-04 10:57:51 -08:00
Ying Wang cce4c973e4 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
2011-03-04 10:48:28 -08:00
Scott Main 6da57060d1 docs: update android market icon
Change-Id: I3659cb6cbeb795debd769efc7245cd14d2a86418
2011-03-04 10:18:04 -08:00
Scott Main befeb8e5d5 docs: css tweaks to quickview subrule
Change-Id: Ib25255c176ed13e8d0bb5edc4172e1629a886125
2011-03-04 09:56:50 -08:00
Scott Main 6c4e37b153 am 75eb14bc: docs: add default margins for form element
* commit '75eb14bc1c2ae4f46c6d67ec51c1a9e8ed42e25f':
  docs: add default margins for form element
2011-03-04 01:21:45 -08:00
Ying Wang a67ce69e9a Handle MODULE_LICENSE_MPL the same as MODULE_LICENSE_GPL.
Change-Id: Iefc6df3f3401a591f53ec3f22202044c60acf460
2011-03-03 14:57:10 -08:00
Scott Main 75eb14bc1c docs: add default margins for form element
Change-Id: Ibce828e2f22193e1725420e90d4df408646f23dd
2011-03-03 10:28:02 -08:00
Ying Wang 1bc81fc523 Merge "sdk.atree does not need DIST_DIR any longer." 2011-03-02 21:23:15 -08:00
Bart Sears 2c8ad30f66 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
2011-03-02 15:33:02 -08:00
Ying Wang cdd1dc0a6f 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
2011-03-02 12:54:55 -08:00
Wink Saville 9423f913ab 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
2011-03-02 12:53:40 -08:00
Doug Zongker 369985c6f2 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
2011-03-02 10:57:06 -08:00
Bart Sears 84684a5ead 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
2011-03-01 18:02:24 -08:00
Bart Sears b67b2f6bad Merge "Do not merge: Update version to 3.0.1 for HC MR0" into honeycomb 2011-03-01 18:00:22 -08:00
Ying Wang 2adc50374a sdk.atree does not need DIST_DIR any longer.
Change-Id: I34d8f13e1ddc27f853e3f15cfe0351d780a47aa8
2011-03-01 16:13:41 -08:00
Ying Wang 1fe8c89298 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
2011-03-01 14:56:57 -08:00
Ying Wang 652654927d 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
2011-03-01 14:16:58 -08:00
Bart Sears a4388edcb9 Do not merge: Update version to 3.0.1 for HC MR0
Change-Id: I301a5926ea6c04d1d5c050bb3796be1adf515737
2011-03-01 13:56:20 -08:00
Wink Saville 6d85b7c774 am 243d9ae2: am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '243d9ae28ce30dda98bc024794218f1a8b21e85f':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:48:38 -08:00
Wink Saville 243d9ae28c am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '4d67e91644ea78b5209de50355ba812a73b519f8':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:16:09 -08:00
Wink Saville 4d67e91644 am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit 'd09b2e552788cc90813e930e3912651e053c657c':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 12:39:42 -08:00