StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,223 Commits 1 Branch 0 Tags
fe75781ee9b51bc1266f5e9d002637c53cd3c92c
Commit Graph

2223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
5a98beecff Merge branch 'eclair' into eclair-release 2009-10-30 16:16:11 -07:00
Scott Main
8d89f800ce am 3f08740b: am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs. 
Merge commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348' into eclair-mr2-plus-aosp

* commit '3f08740b0c2146f0fa1ce90b8e4ab9dcd09c4348':
  docs: fix IE6 bug in which tabs are not focusable
 2009-10-30 15:25:01 -07:00
Scott Main
3f08740b0c am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs. 
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-mr2

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
 2009-10-30 15:15:14 -07:00
Scott Main
f5597885eb am 32b505d9: am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs. 
Merge commit '32b505d984ed15156b87482f849b865892b57ac2' into eclair-plus-aosp

* commit '32b505d984ed15156b87482f849b865892b57ac2':
  docs: fix IE6 bug in which tabs are not focusable
 2009-10-30 15:15:00 -07:00
Scott Main
32b505d984 am 8e44ae9c: docs: fix IE6 bug in which tabs are not focusable while in the reference. also increase the minimum width for the header to avoid line-wrapping of the tabs. 
Merge commit '8e44ae9c762785d80e54bc75e2ba353f486414ec' into eclair

* commit '8e44ae9c762785d80e54bc75e2ba353f486414ec':
  docs: fix IE6 bug in which tabs are not focusable
 2009-10-30 15:04:17 -07:00
Scott Main
8e44ae9c76 docs: fix IE6 bug in which tabs are not focusable 
while in the reference. also increase the minimum
width for the header to avoid line-wrapping of the tabs.
 2009-10-30 13:33:39 -07:00
The Android Automerger
52e093dfe0 ERD30 2009-10-30 09:45:55 -07:00
Mike Reed
8dd26ee452 remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence) 
i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
 2009-10-30 08:32:28 -04:00
The Android Automerger
a0b3a1013b ERD29D 2009-10-29 18:38:38 -07:00
The Android Automerger
b2a8143437 ERD29C 2009-10-29 14:45:53 -07:00
Dan Egnor
8f313a35f8 am b4df557e: am d1850e73: Fix incremental build break in openssl. 
Merge commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f'

* commit 'b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f':
  Fix incremental build break in openssl.
 2009-10-29 13:26:27 -07:00
Dan Egnor
b4df557ed9 am d1850e73: Fix incremental build break in openssl. 
Merge commit 'd1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp

* commit 'd1850e739b0e6d5f788349db0bddb8277757f800':
  Fix incremental build break in openssl.
 2009-10-29 13:15:33 -07:00
Dan Egnor
d1850e739b Fix incremental build break in openssl. 2009-10-29 13:05:27 -07:00
The Android Automerger
68fb49e3ba ERD29B 2009-10-29 08:27:40 -07:00
Scott Main
a06f395a0a am 4ffcb763: am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts. 
Merge commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d'

* commit '4ffcb763447e43d6e8c8f7fa2ed3db474b8b0e5d':
  docs: add checkbox to toggle the api level filter on and off;
 2009-10-29 01:59:40 -07:00
Scott Main
4ffcb76344 am df0ca900: am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts. 
Merge commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f' into eclair-mr2-plus-aosp

* commit 'df0ca90073b6a1ad432791661c481dc7bd34c21f':
  docs: add checkbox to toggle the api level filter on and off;
 2009-10-29 01:51:53 -07:00
Dan Egnor
2b738b4d15 am eda684a2: am a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on. 
Merge commit 'eda684a2666a98d38e7620b59ffd4e335a4f27f6'

* commit 'eda684a2666a98d38e7620b59ffd4e335a4f27f6':
  Clean frameworks after replacing IDropBox.aidl with
 2009-10-29 01:34:38 -07:00
android-build SharedAccount
96fb8fef18 resolved conflicts for merge of 01e7a68f to master 2009-10-29 01:31:08 -07:00
Scott Main
df0ca90073 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts. 
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-mr2

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
 2009-10-29 01:25:23 -07:00
The Android Automerger
8926a65f4a ERD29 2009-10-29 00:07:09 -07:00
The Android Automerger
ed5329899a ERD28B 2009-10-28 23:57:17 -07:00
Jean-Baptiste Queru
c4ec93ec84 am 110dd464: merge from open-source master 
Merge commit '110dd46414574da42c4f07b629b31977d144a849'

* commit '110dd46414574da42c4f07b629b31977d144a849': (46 commits)
  DRC65
  DRC63C
  DRC63B
  DRC63
  DRC62
  DRC59
  DRC58C
  DRC58B
  DRC58
  DRC52
  DRC51
  DRC50
  DRC49
  DRC48
  DRC45B
  DRC45
  DRC44
  DRC43
  DRC42
  DRC37B
  ...
 2009-10-28 23:57:08 -07:00
Scott Main
8866d26c67 am df5e7f7b: am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again. 
Merge commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e'

* commit 'df5e7f7b575bf61b9e94a17dd57ea97bcae07a4e':
  fix search for offline docs. again.
 2009-10-28 23:48:21 -07:00
Dirk Dougherty
3e7a1470c1 am e528cbdc: am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers. 
Merge commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab'

* commit 'e528cbdcb556d095b8d673c1d8933f1e5c1c6eab':
  doc change: include SDK Tools in notice to 1.6 developers.
 2009-10-28 23:48:14 -07:00
Dan Egnor
eda684a266 am a6b495ce: Clean frameworks after replacing IDropBox.aidl with IDropBoxService.aidl, which causes some build confusion with dependencies and Parcelables and so on. 
Merge commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d' into eclair-mr2-plus-aosp

* commit 'a6b495ce40f640f581e27ebd8d935d706daa9f2d':
  Clean frameworks after replacing IDropBox.aidl with
 2009-10-28 17:22:05 -07:00
android-build SharedAccount
01e7a68fd0 am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2 
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp

* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
  Bump version to 2.1 API 6.
 2009-10-28 17:21:53 -07:00
Dan Egnor
a6b495ce40 Clean frameworks after replacing IDropBox.aidl with 
IDropBoxService.aidl, which causes some build confusion
with dependencies and Parcelables and so on.

(Will be checked in immediately after the change in question)
 2009-10-28 16:25:47 -07:00
android-build SharedAccount
8a5d527223 resolved conflicts for merge of 3fa11599 to eclair-mr2 2009-10-28 16:12:11 -07:00
Jean-Baptiste Queru
110dd46414 merge from open-source master 2009-10-28 14:57:01 -07:00
Scott Main
df5e7f7b57 am eae4fc96: am 836a695f: am f1bac52f: fix search for offline docs. again. 
Merge commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b' into eclair-mr2-plus-aosp

* commit 'eae4fc960cec88f50eea7ae65f85f5722b0ad26b':
  fix search for offline docs. again.
 2009-10-28 10:42:13 -07:00
Dirk Dougherty
e528cbdcb5 am 12313686: am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers. 
Merge commit '12313686fb731e79224067ed13749c2c4dae4256' into eclair-mr2-plus-aosp

* commit '12313686fb731e79224067ed13749c2c4dae4256':
  doc change: include SDK Tools in notice to 1.6 developers.
 2009-10-28 10:42:08 -07:00
Scott Main
eae4fc960c am 836a695f: am f1bac52f: fix search for offline docs. again. 
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
 2009-10-28 10:30:34 -07:00
Dirk Dougherty
12313686fb am ee3a3c1f: am c2c5e505: doc change: include SDK Tools in notice to 1.6 developers. 
Merge commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7' into eclair-mr2

* commit 'ee3a3c1f59f6d0d50edce5b0f0f33c02eb3c53d7':
  doc change: include SDK Tools in notice to 1.6 developers.
 2009-10-28 10:26:52 -07:00
The Android Automerger
7353bd07f8 ERD28 2009-10-28 09:26:49 -07:00
The Android Automerger
01eac9e228 Merge branch 'eclair' into eclair-release 2009-10-28 09:26:07 -07:00
Scott Main
a42091e426 am a7d1eaf5: am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts. 
Merge commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e' into eclair-plus-aosp

* commit 'a7d1eaf572e391ed0e4ba6c39c02804ad0c1e14e':
  docs: add checkbox to toggle the api level filter on and off;
 2009-10-27 17:50:58 -07:00
Scott Main
a7d1eaf572 am 9b5fdb9c: docs: add checkbox to toggle the api level filter on and off; this includes some function renaming for the related scripts. 
Merge commit '9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7' into eclair

* commit '9b5fdb9c23f9301d1a963a6e9be4b46ad70922d7':
  docs: add checkbox to toggle the api level filter on and off;
 2009-10-27 17:39:37 -07:00
Scott Main
9b5fdb9c23 docs: add checkbox to toggle the api level filter on and off; 
this includes some function renaming for the related scripts.

the checkbox will be unchecked by default, so any users
that currently have an api level filter selected will now
see all apis until they click the checkbox. the old api level
cookie is still saved the same, but the selected value will only
be applied if the checkbox is selected, which has its own cookie
for on or off.
 2009-10-27 16:56:08 -07:00
Dianne Hackborn
b8906579ab am 3fa11599: Bump version to 2.1 API 6. 
Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp

* commit '3fa115999c8512095301724f557821f25ddfe08f':
  Bump version to 2.1 API 6.
 2009-10-27 12:57:08 -07:00
Android (Google) Code Review
704181ee5b Merge change I3bb7eab9 
* changes:
  Rebuild target object files with new GCC 4.4.0 toolchain.
 2009-10-27 15:54:19 -04:00
The Android Automerger
e8fd08ec4a ERD27 2009-10-27 08:10:39 -07:00
The Android Automerger
d0449a366a Merge branch 'eclair' into eclair-release 2009-10-27 08:10:03 -07:00
Dianne Hackborn
3fa115999c Bump version to 2.1 API 6. 
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
 2009-10-26 17:40:19 -07:00
Android Git Automerger
83209780eb ERD26C 2009-10-26 15:58:05 -07:00
Scott Main
555cca7d31 am 836a695f: am f1bac52f: fix search for offline docs. again. 
Merge commit '836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-plus-aosp

* commit '836a695f01799566969c12d5c83459bdb5d8b2c2':
  fix search for offline docs. again.
 2009-10-26 15:50:36 -07:00
Scott Main
836a695f01 am f1bac52f: fix search for offline docs. again. 
Merge commit 'f1bac52fe28ba503c63c929d9d0711671273635f' into eclair

* commit 'f1bac52fe28ba503c63c929d9d0711671273635f':
  fix search for offline docs. again.
 2009-10-26 15:41:42 -07:00
Jean-Baptiste Queru
b51df61592 merge from open-source master 2009-10-26 15:14:42 -07:00
Scott Main
f1bac52fe2 fix search for offline docs. again. 2009-10-26 14:44:48 -07:00
The Android Open Source Project
caa5543e31 ERD26B 2009-10-26 11:37:21 -07:00
The Android Open Source Project
cf2c62bd61 Merge branch 'eclair' into eclair-release 2009-10-26 11:37:08 -07:00