OSDN Git Service
The Android Automerger [Wed, 18 May 2011 13:09:56 +0000 (06:09 -0700)]
HLJ48
Change-Id: Id99ec7468fec0cdfb83037ae04402171095cd7ea
The Android Automerger [Wed, 18 May 2011 13:09:49 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 17 May 2011 13:08:32 +0000 (06:08 -0700)]
HLJ47
Change-Id: I4d30bf58dbb6f753d55ea0b79177870832951d82
The Android Automerger [Tue, 17 May 2011 13:08:27 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Scott Main [Mon, 16 May 2011 19:19:13 +0000 (12:19 -0700)]
am
9d27a153: am
faf8baaf: docs: make featured video titles smaller so they don\'t line wrap
* commit '
9d27a153f714a312f844a35a0140e3fb1752f4e8':
docs: make featured video titles smaller so they don't line wrap
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 13:00:48 +0000 (06:00 -0700)]
HLJ46
Change-Id: Ia6f600e2d0741d23b9cc1be1cf159430041f69e8
The Android Automerger [Mon, 16 May 2011 13:00:42 +0000 (06:00 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 16 May 2011 03:12:55 +0000 (20:12 -0700)]
HLJ45
Change-Id: Ib4f53560a6c81ca44203207e7fbe18e0808e878f
The Android Automerger [Mon, 16 May 2011 03:12:50 +0000 (20:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Sat, 14 May 2011 05:14:29 +0000 (22:14 -0700)]
HLJ43B
Change-Id: Idc37d0305218505100025ff19dd6fb4c6254e684
The Android Automerger [Sat, 14 May 2011 05:14:23 +0000 (22:14 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 13 May 2011 13:07:57 +0000 (06:07 -0700)]
HLJ43
Change-Id: Ie16a7790fe0b2f3cf02651b498318a73e50fbb09
The Android Automerger [Fri, 13 May 2011 13:07:50 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 12 May 2011 22:19:48 +0000 (15:19 -0700)]
HLJ42B
Change-Id: I638a7e308855b67b39820c1e91da2ce22a468a92
The Android Automerger [Thu, 12 May 2011 22:19:43 +0000 (15:19 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 12 May 2011 13:07:57 +0000 (06:07 -0700)]
HLJ42
Change-Id: I484952f2d0dd5ac33136232473eb39cc52d5c47d
The Android Automerger [Thu, 12 May 2011 13:07:52 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Dianne Hackborn [Wed, 11 May 2011 20:35:36 +0000 (13:35 -0700)]
am
22b5d621: DO NOT MERGE. We are now dev branch for Honeycomb MR2.
* commit '
22b5d62172f1563a2513dea314c037703cddf217':
DO NOT MERGE. We are now dev branch for Honeycomb MR2.
The Android Automerger [Wed, 11 May 2011 13:09:44 +0000 (06:09 -0700)]
HLJ41
Change-Id: Iefcea59b02c0b9e541fe2b96d04d9a4461d796f6
The Android Automerger [Wed, 11 May 2011 13:09:36 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 10 May 2011 13:07:42 +0000 (06:07 -0700)]
HLJ40
Change-Id: I03814229417ccaff2aecfb1ca421ced9dd3d1f5a
The Android Automerger [Tue, 10 May 2011 13:07:25 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
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 13:07:40 +0000 (06:07 -0700)]
HLJ39
Change-Id: I561bd92faefe6267a1ba8cb4448f97210128b65b
The Android Automerger [Mon, 9 May 2011 13:07:28 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 6 May 2011 19:17:41 +0000 (12:17 -0700)]
HLJ36B
Change-Id: I5b0a0a27f276acb811d2f9e14a7561f3e9ad6584
The Android Automerger [Fri, 6 May 2011 19:17:29 +0000 (12:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 6 May 2011 13:08:24 +0000 (06:08 -0700)]
HLJ36
Change-Id: I04f446c67f3b9d4c432d7848e4e6e9c8d47beeb5
The Android Automerger [Fri, 6 May 2011 13:08:13 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 5 May 2011 13:07:33 +0000 (06:07 -0700)]
HLJ35
Change-Id: Ib8fe66e435d22c211fd90839854478e9abfc5ae0
The Android Automerger [Thu, 5 May 2011 13:07:19 +0000 (06:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 4 May 2011 13:46:37 +0000 (06:46 -0700)]
HLJ34
Change-Id: I2451a929586d4fd6c9f9f93a16569dbcbabf4b04
The Android Automerger [Wed, 4 May 2011 13:46:16 +0000 (06:46 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 3 May 2011 13:09:22 +0000 (06:09 -0700)]
HLJ33
Change-Id: I74b36780b046c8a682c05f26a4ad7b3adb9c5e94
The Android Automerger [Tue, 3 May 2011 13:09:10 +0000 (06:09 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 2 May 2011 13:08:39 +0000 (06:08 -0700)]
HLJ32
Change-Id: Iccdc038e5b73c8b56b81d1e5639334294a1ae7c7
The Android Automerger [Mon, 2 May 2011 13:08:29 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 29 Apr 2011 13:08:56 +0000 (06:08 -0700)]
HLJ29
Change-Id: I600c12f5eec758f17c93642396e13937ff158ca6
The Android Automerger [Fri, 29 Apr 2011 13:08:43 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 28 Apr 2011 13:09:19 +0000 (06:09 -0700)]
HLJ28
Change-Id: Ib61543e31fb7cd12ea46b0893edbfef680f72ee8
The Android Automerger [Thu, 28 Apr 2011 13:08:57 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 27 Apr 2011 13:08:36 +0000 (06:08 -0700)]
HLJ27
Change-Id: I148ab65331bcbef5b6eb059604256b8559680390
The Android Automerger [Wed, 27 Apr 2011 13:08:12 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 26 Apr 2011 13:07:09 +0000 (06:07 -0700)]
HLJ26
Change-Id: I57d85faad0fdb48266c599359a1a92d1808bdd30
The Android Automerger [Tue, 26 Apr 2011 13:06:58 +0000 (06:06 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 25 Apr 2011 13:08:24 +0000 (06:08 -0700)]
HLJ25
Change-Id: I45ef04c51d2f98f4b3a625e7af47ad55f01edb11
The Android Automerger [Mon, 25 Apr 2011 13:08:00 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 22 Apr 2011 13:08:28 +0000 (06:08 -0700)]
HLJ22
Change-Id: Ie7ea19aaa3527fa5161ef32e2b5a6235c1aea170
The Android Automerger [Fri, 22 Apr 2011 13:08:08 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 21 Apr 2011 13:08:22 +0000 (06:08 -0700)]
HLJ21
Change-Id: Ib520cae20366f8f710b5484863b991a2951b7630
The Android Automerger [Thu, 21 Apr 2011 13:08:11 +0000 (06:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 20 Apr 2011 14:35:19 +0000 (07:35 -0700)]
HLJ20
Change-Id: I854313d2e864be625afa918e5752aaa09caafaf9
The Android Automerger [Wed, 20 Apr 2011 14:35:07 +0000 (07:35 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 19 Apr 2011 14:08:05 +0000 (07:08 -0700)]
HLJ19
Change-Id: Ic37c182d110747dea304d052db9f3069916e81e8
The Android Automerger [Tue, 19 Apr 2011 14:07:54 +0000 (07:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 18 Apr 2011 14:08:50 +0000 (07:08 -0700)]
HLJ18
Change-Id: I3ab5fe37a9f94fda64fed7900be5d2d7e6276fae
The Android Automerger [Mon, 18 Apr 2011 14:08:33 +0000 (07:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 15 Apr 2011 14:17:44 +0000 (07:17 -0700)]
HLJ15
Change-Id: I5eb12c894d0a26210f60dc051e05d9cf25dadd33
The Android Automerger [Fri, 15 Apr 2011 14:17:28 +0000 (07:17 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 14 Apr 2011 14:07:59 +0000 (07:07 -0700)]
HLJ14
Change-Id: I05d8dfc8a81c8c679584919853ab41a777e38eda
The Android Automerger [Thu, 14 Apr 2011 14:07:45 +0000 (07:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Ying Wang [Tue, 22 Mar 2011 22:32:52 +0000 (15:32 -0700)]
Drop using vendor/google/etc/apns-conf.xml for eng builds.
Bug:
4133493
Change-Id: I3eee2a5658620f480370d260b395e928bc395886
The Android Automerger [Wed, 13 Apr 2011 14:08:04 +0000 (07:08 -0700)]
HLJ13
Change-Id: Iec61807094c2a59a23abb63bbbacb441e627cc9d
The Android Automerger [Wed, 13 Apr 2011 14:07:52 +0000 (07:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Tue, 12 Apr 2011 14:07:35 +0000 (07:07 -0700)]
HLJ12
Change-Id: I0a766d9c3b55d8caf9e19561a2e9e2be1a0da16e
The Android Automerger [Tue, 12 Apr 2011 14:07:11 +0000 (07:07 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Mon, 11 Apr 2011 14:08:25 +0000 (07:08 -0700)]
HLJ11
Change-Id: Ic2f7308a293bf99dd64d669295369bd4289db63a
The Android Automerger [Mon, 11 Apr 2011 14:08:07 +0000 (07:08 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Fri, 8 Apr 2011 14:07:08 +0000 (07:07 -0700)]
HLJ08
Change-Id: I57dca99300ed97087e0cd56c3906fe21706647a8
The Android Automerger [Fri, 8 Apr 2011 14:06:43 +0000 (07:06 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Thu, 7 Apr 2011 14:12:41 +0000 (07:12 -0700)]
HLJ07
Change-Id: Ia2358af394ddfb5628f82e393b62d696db8924d6
The Android Automerger [Thu, 7 Apr 2011 14:12:27 +0000 (07:12 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
The Android Automerger [Wed, 6 Apr 2011 14:20:07 +0000 (07:20 -0700)]
HLJ06
Change-Id: Ib41cd96872ca170c5950946c79255b428f4257a0
The Android Automerger [Wed, 6 Apr 2011 14:20:02 +0000 (07:20 -0700)]
merge in honeycomb-LTE-release history after reset to honeycomb-LTE
Sriram Raman [Tue, 5 Apr 2011 19:22:37 +0000 (15:22 -0400)]
HLJ05
Change-Id: I4018566f267beff29bc89200cd4bb75633bb0643
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