OSDN Git Service
Xavier Ducrohet [Fri, 13 Nov 2009 18:55:26 +0000 (10:55 -0800)]
am
e43eb27f: am
2bfaec8d: am
c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '
e43eb27fc0ff883e83cdf4ff9b9bc403bff120be'
* commit '
e43eb27fc0ff883e83cdf4ff9b9bc403bff120be':
Add the sdk overlay to the build.
Xavier Ducrohet [Fri, 13 Nov 2009 18:40:51 +0000 (10:40 -0800)]
am
2bfaec8d: am
c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '
2bfaec8d3299031130330e4b6b32603df6900697' into eclair-mr2-plus-aosp
* commit '
2bfaec8d3299031130330e4b6b32603df6900697':
Add the sdk overlay to the build.
Xavier Ducrohet [Fri, 13 Nov 2009 17:08:30 +0000 (09:08 -0800)]
am
c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2
* commit '
c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
Add the sdk overlay to the build.
Android (Google) Code Review [Fri, 13 Nov 2009 00:20:00 +0000 (16:20 -0800)]
Merge change I4d3d08a1 into eclair
* changes:
Add the sdk overlay to the build.
Dan Egnor [Thu, 12 Nov 2009 22:21:21 +0000 (14:21 -0800)]
am
26bcb110: am
75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '
26bcb110f81ff0f00593839bf8bd013c390649b8'
* commit '
26bcb110f81ff0f00593839bf8bd013c390649b8':
Clean old DropBoxService.java generated class
Dan Egnor [Thu, 12 Nov 2009 22:16:54 +0000 (14:16 -0800)]
am
75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '
753846943dfd32c4dce100743fb143c8eb3119d5' into eclair-mr2-plus-aosp
* commit '
753846943dfd32c4dce100743fb143c8eb3119d5':
Clean old DropBoxService.java generated class
Android (Google) Code Review [Thu, 12 Nov 2009 22:10:31 +0000 (14:10 -0800)]
Merge change I0c33d697 into eclair-mr2
* changes:
Clean old DropBoxService.java generated class
Dan Egnor [Thu, 12 Nov 2009 19:42:15 +0000 (11:42 -0800)]
Clean old DropBoxService.java generated class
David 'Digit' Turner [Thu, 12 Nov 2009 02:19:48 +0000 (18:19 -0800)]
am
e870a487: am
002d1c24: am
31597999: Merge change I2edfb71d into eclair
Merge commit '
e870a487d6679eecca1f19524807cc2215922fb5'
* commit '
e870a487d6679eecca1f19524807cc2215922fb5':
Support secondary CPU ABI in build.prop
David 'Digit' Turner [Thu, 12 Nov 2009 02:15:08 +0000 (18:15 -0800)]
am
002d1c24: am
31597999: Merge change I2edfb71d into eclair
Merge commit '
002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp
* commit '
002d1c24b4dee2582e660f80669176c4a3e2db33':
Support secondary CPU ABI in build.prop
David 'Digit' Turner [Thu, 12 Nov 2009 02:12:06 +0000 (18:12 -0800)]
am
31597999: Merge change I2edfb71d into eclair
Merge commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2
* commit '
31597999a61c6b58b8f8b903f5f228a6ca07183f':
Support secondary CPU ABI in build.prop
Android (Google) Code Review [Thu, 12 Nov 2009 02:08:03 +0000 (18:08 -0800)]
Merge change I2edfb71d into eclair
* changes:
Support secondary CPU ABI in build.prop
Xavier Ducrohet [Wed, 11 Nov 2009 01:52:55 +0000 (17:52 -0800)]
Add the sdk overlay to the build.
Change-Id: I4d3d08a13d23194a84fdd822a130f9aa71bb6360
Steve Block [Tue, 10 Nov 2009 23:27:37 +0000 (15:27 -0800)]
am
4ceee017: am
6ef2c375: Merge change I2bba1884 into eclair-mr2
Merge commit '
4ceee017811ac4802703b40ac3997f393ead245b'
* commit '
4ceee017811ac4802703b40ac3997f393ead245b':
Clean libwebkit, libjs and libv8 after WebKit merge.
Doug Zongker [Tue, 10 Nov 2009 23:22:49 +0000 (15:22 -0800)]
am
4cc57b40: am
d628eaca: am
f17e6387: allow use of unzip version 6.0
Merge commit '
4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e'
* commit '
4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e':
allow use of unzip version 6.0
Steve Block [Tue, 10 Nov 2009 23:21:48 +0000 (15:21 -0800)]
am
6ef2c375: Merge change I2bba1884 into eclair-mr2
Merge commit '
6ef2c3759bf7ec457b86335bc2e06c6e6328fc24' into eclair-mr2-plus-aosp
* commit '
6ef2c3759bf7ec457b86335bc2e06c6e6328fc24':
Clean libwebkit, libjs and libv8 after WebKit merge.
Android (Google) Code Review [Tue, 10 Nov 2009 22:54:04 +0000 (14:54 -0800)]
Merge change I2bba1884 into eclair-mr2
* changes:
Clean libwebkit, libjs and libv8 after WebKit merge.
Doug Zongker [Tue, 10 Nov 2009 22:52:07 +0000 (14:52 -0800)]
am
d628eaca: am
f17e6387: allow use of unzip version 6.0
Merge commit '
d628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp
* commit '
d628eacae7af10c520df98323250b385212270ca':
allow use of unzip version 6.0
Doug Zongker [Tue, 10 Nov 2009 20:33:31 +0000 (12:33 -0800)]
am
f17e6387: allow use of unzip version 6.0
Merge commit '
f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2
* commit '
f17e63879c9356d107bda7f8d599f7ce5f449051':
allow use of unzip version 6.0
Elliott Hughes [Tue, 10 Nov 2009 07:49:43 +0000 (23:49 -0800)]
Teach apicheck about interface methods.
If a method is declared by an interface implemented directly by a class,
or indirectly by any of its superclasses, removing a duplicate declaration
is not an API change.
(This fixes the master build, which is currently broken because getOption
and setOption were removed from DatagramSocketImpl because they were
duplicate declarations of the same methods in the implemented interface
SocketOptions.)
Doug Zongker [Tue, 10 Nov 2009 02:19:48 +0000 (18:19 -0800)]
allow use of unzip version 6.0
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr". Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
Steve Block [Tue, 10 Nov 2009 02:15:49 +0000 (02:15 +0000)]
Clean libwebkit, libjs and libv8 after WebKit merge.
Change-Id: I2bba18843aa31b849de53e047dceb40de5eccc8a
Xavier Ducrohet [Mon, 9 Nov 2009 21:49:21 +0000 (13:49 -0800)]
am
ebbb0d45: am
38c09a03: am
216faf3f: Add Livewallpapers picker to SDK.
Merge commit '
ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce'
* commit '
ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce':
Add Livewallpapers picker to SDK.
Xavier Ducrohet [Mon, 9 Nov 2009 21:49:18 +0000 (13:49 -0800)]
Android (Google) Code Review [Mon, 9 Nov 2009 21:19:32 +0000 (13:19 -0800)]
Merge change I573364cd
* changes:
Fix the host rule for building executables on darwin-x86.
Xavier Ducrohet [Mon, 9 Nov 2009 20:14:45 +0000 (12:14 -0800)]
am
38c09a03: am
216faf3f: Add Livewallpapers picker to SDK.
Merge commit '
38c09a03195bbfee94b887ca6b1b8da3d79a4841' into eclair-mr2-plus-aosp
* commit '
38c09a03195bbfee94b887ca6b1b8da3d79a4841':
Add Livewallpapers picker to SDK.
Xavier Ducrohet [Mon, 9 Nov 2009 20:14:42 +0000 (12:14 -0800)]
am
07cca294: am
58302409: Add CertInstaller to the SDK.
Merge commit '
07cca294a362450a5fc86e372d77503daab11eb1' into eclair-mr2-plus-aosp
* commit '
07cca294a362450a5fc86e372d77503daab11eb1':
Add CertInstaller to the SDK.
Jean-Baptiste Queru [Mon, 9 Nov 2009 20:07:48 +0000 (12:07 -0800)]
am
e1b710a5: merge from open-source master
Merge commit '
e1b710a5ba16be660d5383f1e56bd76b664b1d05'
* commit '
e1b710a5ba16be660d5383f1e56bd76b664b1d05':
Added prune options to findleaves.sh to ignore the .git and .repo
Added a default to specify an alternative tool chain prefix if needed.
Update prelink map for libFLAC
Xavier Ducrohet [Mon, 9 Nov 2009 19:59:56 +0000 (11:59 -0800)]
am
216faf3f: Add Livewallpapers picker to SDK.
Merge commit '
216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-mr2
* commit '
216faf3f1c2c8857ad7e88e860897766c830ce31':
Add Livewallpapers picker to SDK.
Xavier Ducrohet [Mon, 9 Nov 2009 19:59:51 +0000 (11:59 -0800)]
am
58302409: Add CertInstaller to the SDK.
Merge commit '
58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2
* commit '
58302409dd88d10e5c0ab03e5c5b5729ca41111a':
Add CertInstaller to the SDK.
Jean-Baptiste Queru [Mon, 9 Nov 2009 18:34:27 +0000 (10:34 -0800)]
merge from open-source master
Dan Bornstein [Mon, 9 Nov 2009 01:44:01 +0000 (17:44 -0800)]
Fix the host rule for building executables on darwin-x86.
Change-Id: I573364cd0c95ce0157e21d3bb4f7e3b13c61dd70
Xavier Ducrohet [Sun, 8 Nov 2009 23:42:25 +0000 (15:42 -0800)]
Add Livewallpapers picker to SDK.
Change-Id: If14c073c13b13bdd042e2a48aa867f4fa2be7572
Android Code Review [Sun, 8 Nov 2009 22:17:01 +0000 (14:17 -0800)]
Merge change I6d9c9295
* changes:
Added a default to specify an alternative tool chain prefix if needed.
Xavier Ducrohet [Thu, 29 Oct 2009 23:40:03 +0000 (16:40 -0700)]
Add CertInstaller to the SDK.
Change-Id: I1e680d24080a6514e2dc049d64e570f8cd759dd7
David 'Digit' Turner [Fri, 6 Nov 2009 23:12:00 +0000 (15:12 -0800)]
Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.
This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.
TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
Dan Morrill [Fri, 6 Nov 2009 22:06:06 +0000 (14:06 -0800)]
Work in progress snapshot of the refreshed content for source.android.com
(formerly PDK).
Mike Reed [Fri, 6 Nov 2009 19:35:02 +0000 (11:35 -0800)]
am
ebed06a2: am
65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit '
ebed06a259eb1c00112a4e3a9d6d721700bbaedb'
* commit '
ebed06a259eb1c00112a4e3a9d6d721700bbaedb':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Mike Reed [Fri, 6 Nov 2009 19:24:37 +0000 (11:24 -0800)]
am
65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit '
65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp
* commit '
65a731b737bd6e8afa0b18176064dcc130dbb4ce':
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
Android (Google) Code Review [Fri, 6 Nov 2009 19:16:37 +0000 (14:16 -0500)]
Merge change I8dd26ee4 into eclair-mr2
* changes:
remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
akushner [Thu, 5 Nov 2009 20:49:27 +0000 (12:49 -0800)]
Added prune options to findleaves.sh to ignore the .git and .repo
directories since the Android.mk files will not be found in these
directories.
Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
Fred Quintana [Thu, 5 Nov 2009 20:00:08 +0000 (12:00 -0800)]
am
6f007cf9: am
aa82f8ee: am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
6f007cf96c21b1dfce6e258eee5c2963aa86bcf1'
* commit '
6f007cf96c21b1dfce6e258eee5c2963aa86bcf1':
add the new accounts and sync package to the generic target and enable sync for all builds
Fred Quintana [Thu, 5 Nov 2009 19:49:53 +0000 (11:49 -0800)]
am
aa82f8ee: am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp
* commit '
aa82f8ee8f747e4466f3f6754201765a2b5b3707':
add the new accounts and sync package to the generic target and enable sync for all builds
Fred Quintana [Thu, 5 Nov 2009 19:23:44 +0000 (11:23 -0800)]
am
357f5bc8: Merge change I7397e6fe into eclair
Merge commit '
357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2
* commit '
357f5bc804fc80f06776e1da141e4b322d7e3248':
add the new accounts and sync package to the generic target and enable sync for all builds
Android (Google) Code Review [Thu, 5 Nov 2009 19:15:58 +0000 (14:15 -0500)]
Merge change I7397e6fe into eclair
* changes:
add the new accounts and sync package to the generic target and enable sync for all builds
Steve Block [Thu, 5 Nov 2009 07:42:53 +0000 (23:42 -0800)]
am
06c3a04e: am
5243b109: WebKit clean required by move of V8 to external/v8.
Merge commit '
06c3a04ef4a14fb8943c759a6d67cf5c46f5da33'
* commit '
06c3a04ef4a14fb8943c759a6d67cf5c46f5da33':
WebKit clean required by move of V8 to external/v8.
Steve Block [Thu, 5 Nov 2009 07:33:28 +0000 (23:33 -0800)]
am
5243b109: WebKit clean required by move of V8 to external/v8.
Merge commit '
5243b109acec2b03431aef36ccc42256b77ae316' into eclair-mr2-plus-aosp
* commit '
5243b109acec2b03431aef36ccc42256b77ae316':
WebKit clean required by move of V8 to external/v8.
Steve Block [Tue, 3 Nov 2009 21:10:45 +0000 (21:10 +0000)]
WebKit clean required by move of V8 to external/v8.
Change-Id: Idc425e143c928a7da39af9a002705699e3e12901
Android Code Review [Wed, 4 Nov 2009 17:17:13 +0000 (09:17 -0800)]
Merge change I377f1f02
* changes:
Update prelink map for libFLAC
Scott Main [Wed, 4 Nov 2009 03:32:27 +0000 (19:32 -0800)]
am
47f77397: am
747f2997: am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
47f77397bed3c381101423d143e83b2cc7e27b49'
* commit '
47f77397bed3c381101423d143e83b2cc7e27b49':
docs: revise resizing scripts to better organize the
Scott Main [Wed, 4 Nov 2009 03:22:34 +0000 (19:22 -0800)]
am
747f2997: am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
747f2997f1ddeac97090ce1d94d04eed9cffc529' into eclair-mr2-plus-aosp
* commit '
747f2997f1ddeac97090ce1d94d04eed9cffc529':
docs: revise resizing scripts to better organize the
Scott Main [Wed, 4 Nov 2009 03:12:40 +0000 (19:12 -0800)]
am
24fbbfaa: am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00' into eclair-mr2
* commit '
24fbbfaa80ce17481e695c001b66c0176b8f0f00':
docs: revise resizing scripts to better organize the
Scott Main [Wed, 4 Nov 2009 03:04:40 +0000 (19:04 -0800)]
am
3f7d1df1: docs: revise resizing scripts to better organize the tasks into chunks that are only executed when necessary.
Merge commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b' into eclair
* commit '
3f7d1df12938b6db9849b03c05d5a56784ee147b':
docs: revise resizing scripts to better organize the
Fred Quintana [Tue, 3 Nov 2009 23:04:59 +0000 (15:04 -0800)]
add the new accounts and sync package to the generic target and enable sync for all builds
Scott Main [Mon, 2 Nov 2009 23:31:04 +0000 (15:31 -0800)]
docs: revise resizing scripts to better organize the
tasks into chunks that are only executed when necessary.
Move the stuff that does the reference panel resizing
into a separate method because this should only happen when
literally resizing the panels. This thus resolves the problem
in which an invalid cookie would sometimes be written during
a normal window resize event -- there's no need to write that
cookie unless the user literally resizes the panel.
There's no need to call resizeWidth all the time, the doc-content
div can manage its width by inheritence and should only ever have
to resize its left margin when the side nav is manually resized or
when the page is loaded (in order to account for a saved side nav
width). This vastly improves the performance and visual quality
when resizing. However, IE6 still requires this in order for the scrollbars
to be visible in the content area. So a flag is now set when IE6 is
the browser, it has its own onresize method
and the width is defined only for IE6.
Inside resizeHeight, check what the href path is before doing any
resizing, just to make sure we don't do unecessary work and to
make the code more readable.
Scott Main [Tue, 3 Nov 2009 03:08:25 +0000 (19:08 -0800)]
am
034a1089: am
4d3aa886: am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
034a10891facd6e334be71b515e1d65c281f4278'
* commit '
034a10891facd6e334be71b515e1d65c281f4278':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:59:08 +0000 (18:59 -0800)]
am
4d3aa886: am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
4d3aa886dbafcc76e0a5fa6b947a98395beb836e' into eclair-mr2-plus-aosp
* commit '
4d3aa886dbafcc76e0a5fa6b947a98395beb836e':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:50:09 +0000 (18:50 -0800)]
am
ec4194ef: am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245' into eclair-mr2
* commit '
ec4194ef1baa2906f916a01e368bb5d6805ba245':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:40:23 +0000 (18:40 -0800)]
am
64b879ac: docs: fix js error when there\'s no api level cookie saved.
Merge commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22' into eclair
* commit '
64b879ac5bbabe0489869f76b3a20f26aca6ce22':
docs: fix js error when there's no api level cookie saved.
Scott Main [Tue, 3 Nov 2009 02:05:41 +0000 (18:05 -0800)]
docs: fix js error when there's no api level cookie saved.
currently, if there's no api level cookie saved, then
the selectedLevelItem variable will be undefined and will
throw an error at the end of the buildApilevelSelector function.
Now, userApiLevel is set to the max level in this case.
Scott Main [Mon, 2 Nov 2009 05:55:23 +0000 (21:55 -0800)]
am
8d89f800: 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 '
8d89f800ceb04a726597779be845cc45090c8c46'
* commit '
8d89f800ceb04a726597779be845cc45090c8c46':
docs: fix IE6 bug in which tabs are not focusable
Scott Main [Fri, 30 Oct 2009 22:25:01 +0000 (15:25 -0700)]
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
Scott Main [Fri, 30 Oct 2009 22:15:14 +0000 (15:15 -0700)]
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
Scott Main [Fri, 30 Oct 2009 22:04:17 +0000 (15:04 -0700)]
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
Scott Main [Fri, 30 Oct 2009 20:33:39 +0000 (13:33 -0700)]
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.
Mike Reed [Fri, 30 Oct 2009 12:32:28 +0000 (08:32 -0400)]
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
Dan Egnor [Thu, 29 Oct 2009 20:26:27 +0000 (13:26 -0700)]
am
b4df557e: am
d1850e73: Fix incremental build break in openssl.
Merge commit '
b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f'
* commit '
b4df557ed9c42dc05c1a1f81aa7d44e4b96d862f':
Fix incremental build break in openssl.
Dan Egnor [Thu, 29 Oct 2009 20:15:33 +0000 (13:15 -0700)]
am
d1850e73: Fix incremental build break in openssl.
Merge commit '
d1850e739b0e6d5f788349db0bddb8277757f800' into eclair-mr2-plus-aosp
* commit '
d1850e739b0e6d5f788349db0bddb8277757f800':
Fix incremental build break in openssl.
Dan Egnor [Thu, 29 Oct 2009 20:05:27 +0000 (13:05 -0700)]
Fix incremental build break in openssl.
Scott Main [Thu, 29 Oct 2009 08:59:40 +0000 (01:59 -0700)]
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;
Scott Main [Thu, 29 Oct 2009 08:51:53 +0000 (01:51 -0700)]
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;
Dan Egnor [Thu, 29 Oct 2009 08:34:38 +0000 (01:34 -0700)]
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
android-build SharedAccount [Thu, 29 Oct 2009 08:31:08 +0000 (01:31 -0700)]
resolved conflicts for merge of
01e7a68f to master
Scott Main [Thu, 29 Oct 2009 08:25:23 +0000 (01:25 -0700)]
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;
Jean-Baptiste Queru [Thu, 29 Oct 2009 06:57:08 +0000 (23:57 -0700)]
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
...
Scott Main [Thu, 29 Oct 2009 06:48:21 +0000 (23:48 -0700)]
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.
Dirk Dougherty [Thu, 29 Oct 2009 06:48:14 +0000 (23:48 -0700)]
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.
Dan Egnor [Thu, 29 Oct 2009 00:22:05 +0000 (17:22 -0700)]
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
android-build SharedAccount [Thu, 29 Oct 2009 00:21:53 +0000 (17:21 -0700)]
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.
Dan Egnor [Wed, 28 Oct 2009 01:46:27 +0000 (18:46 -0700)]
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)
android-build SharedAccount [Wed, 28 Oct 2009 23:12:11 +0000 (16:12 -0700)]
resolved conflicts for merge of
3fa11599 to eclair-mr2
Jean-Baptiste Queru [Wed, 28 Oct 2009 21:57:01 +0000 (14:57 -0700)]
merge from open-source master
Scott Main [Wed, 28 Oct 2009 17:42:13 +0000 (10:42 -0700)]
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.
Dirk Dougherty [Wed, 28 Oct 2009 17:42:08 +0000 (10:42 -0700)]
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.
Scott Main [Wed, 28 Oct 2009 17:30:34 +0000 (10:30 -0700)]
am
836a695f: am
f1bac52f: fix search for offline docs. again.
Merge commit '
836a695f01799566969c12d5c83459bdb5d8b2c2' into eclair-mr2
* commit '
836a695f01799566969c12d5c83459bdb5d8b2c2':
fix search for offline docs. again.
Dirk Dougherty [Wed, 28 Oct 2009 17:26:52 +0000 (10:26 -0700)]
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.
Scott Main [Wed, 28 Oct 2009 00:39:37 +0000 (17:39 -0700)]
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;
Scott Main [Tue, 27 Oct 2009 22:09:15 +0000 (15:09 -0700)]
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.
Android (Google) Code Review [Tue, 27 Oct 2009 19:54:19 +0000 (15:54 -0400)]
Merge change I3bb7eab9
* changes:
Rebuild target object files with new GCC 4.4.0 toolchain.
Dianne Hackborn [Fri, 23 Oct 2009 19:17:45 +0000 (12:17 -0700)]
Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
Scott Main [Mon, 26 Oct 2009 22:41:42 +0000 (15:41 -0700)]
am
f1bac52f: fix search for offline docs. again.
Merge commit '
f1bac52fe28ba503c63c929d9d0711671273635f' into eclair
* commit '
f1bac52fe28ba503c63c929d9d0711671273635f':
fix search for offline docs. again.
Scott Main [Mon, 26 Oct 2009 21:44:48 +0000 (14:44 -0700)]
fix search for offline docs. again.
Dirk Dougherty [Mon, 26 Oct 2009 18:18:47 +0000 (11:18 -0700)]
am
c2c5e505: doc change: include SDK Tools in notice to 1.6 developers.
Merge commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259' into eclair
* commit '
c2c5e505ac5eda38eb7be4e2ce8f094e5c0e1259':
doc change: include SDK Tools in notice to 1.6 developers.
Dirk Dougherty [Sat, 24 Oct 2009 21:38:58 +0000 (14:38 -0700)]
doc change: include SDK Tools in notice to 1.6 developers.
Bug:
2160782
Change-Id: Ib70255c889495df7dbb958fe51977735554a0912
Scott Main [Sat, 24 Oct 2009 04:32:32 +0000 (21:32 -0700)]
am
66a27b01: am
214ea8f1: am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
66a27b01201027e371b74b0eb18572dfb7303238'
* commit '
66a27b01201027e371b74b0eb18572dfb7303238':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:23:04 +0000 (21:23 -0700)]
am
214ea8f1: am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
214ea8f14ee2b62b80905ad038110066f95be84b' into eclair-mr2-plus-aosp
* commit '
214ea8f14ee2b62b80905ad038110066f95be84b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:13:32 +0000 (21:13 -0700)]
am
3af366dd: am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
3af366ddb2634f97f440b1437bbd21d00101c93b' into eclair-mr2
* commit '
3af366ddb2634f97f440b1437bbd21d00101c93b':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 04:04:02 +0000 (21:04 -0700)]
am
462cc377: docs: implement sdk announcement in a collapsible box and revise the \'special\' box color and add rounded corners.
Merge commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef' into eclair
* commit '
462cc37742b4e7d8e348ac9264eb3e5e35cbfeef':
docs: implement sdk announcement in a collapsible box
Scott Main [Sat, 24 Oct 2009 00:29:02 +0000 (17:29 -0700)]
am
c41d2516: am
11cb880f: am
e0ac5c3e: am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
c41d251615431a36fc3b664d2bdbe749702a11d9'
* commit '
c41d251615431a36fc3b664d2bdbe749702a11d9':
docs: change javascript so that SDK docs that are not
Scott Main [Sat, 24 Oct 2009 00:19:06 +0000 (17:19 -0700)]
am
11cb880f: am
e0ac5c3e: am
0d8872e6: docs: change javascript so that SDK docs that are not listed in the left nav do not highlight parent index documents
Merge commit '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b' into eclair-mr2-plus-aosp
* commit '
11cb880f1ef5296cb9eb1aff478808248eb7fe6b':
docs: change javascript so that SDK docs that are not