Commit Graph

2223 Commits

Author SHA1 Message Date
Dan Egnor
fb78ca6efd am 26bcb110: am 75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '26bcb110f81ff0f00593839bf8bd013c390649b8'

* commit '26bcb110f81ff0f00593839bf8bd013c390649b8':
  Clean old DropBoxService.java generated class
2009-11-12 14:21:21 -08:00
Dan Egnor
26bcb110f8 am 75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '753846943dfd32c4dce100743fb143c8eb3119d5' into eclair-mr2-plus-aosp

* commit '753846943dfd32c4dce100743fb143c8eb3119d5':
  Clean old DropBoxService.java generated class
2009-11-12 14:16:54 -08:00
Android (Google) Code Review
753846943d Merge change I0c33d697 into eclair-mr2
* changes:
  Clean old DropBoxService.java generated class
2009-11-12 14:10:31 -08:00
Dan Egnor
0c33d697e7 Clean old DropBoxService.java generated class 2009-11-12 11:42:15 -08:00
The Android Automerger
ec9ebe7dcb ERD43 2009-11-12 08:33:34 -08:00
The Android Automerger
7390b86396 Merge branch 'eclair' into eclair-release 2009-11-12 08:33:11 -08:00
David 'Digit' Turner
579e12bb6e am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

* commit 'e870a487d6679eecca1f19524807cc2215922fb5':
  Support secondary CPU ABI in build.prop
2009-11-11 18:19:48 -08:00
David 'Digit' Turner
e870a487d6 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
2009-11-11 18:15:08 -08:00
David 'Digit' Turner
0464bc49e1 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:13:01 -08:00
David 'Digit' Turner
002d1c24b4 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:12:06 -08:00
Android (Google) Code Review
31597999a6 Merge change I2edfb71d into eclair
* changes:
  Support secondary CPU ABI in build.prop
2009-11-11 18:08:03 -08:00
android-build SharedAccount
ce902a8bcd ERD42B 2009-11-11 15:56:31 -08:00
The Android Automerger
b93a2505db ERD42 2009-11-11 08:36:49 -08:00
The Android Automerger
cc6b13cd7f Merge branch 'eclair' into eclair-release 2009-11-11 08:36:27 -08:00
Jean-Baptiste Queru
96c3892fc0 merge from open-source master 2009-11-11 08:19:07 -08:00
Xavier Ducrohet
325b2eb9cb Add the sdk overlay to the build.
Change-Id: I4d3d08a13d23194a84fdd822a130f9aa71bb6360
2009-11-10 17:52:55 -08:00
Steve Block
ffff296514 am 4ceee017: am 6ef2c375: Merge change I2bba1884 into eclair-mr2
Merge commit '4ceee017811ac4802703b40ac3997f393ead245b'

* commit '4ceee017811ac4802703b40ac3997f393ead245b':
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 15:27:37 -08:00
Doug Zongker
fec674d99c 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
2009-11-10 15:22:49 -08:00
Steve Block
4ceee01781 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.
2009-11-10 15:21:48 -08:00
Android (Google) Code Review
6ef2c3759b Merge change I2bba1884 into eclair-mr2
* changes:
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 14:54:04 -08:00
Doug Zongker
4cc57b40fc 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
2009-11-10 14:52:07 -08:00
Doug Zongker
d628eacae7 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:33:31 -08:00
Doug Zongker
baa5760a51 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:32:59 -08:00
The Android Automerger
ea6d7d479d ERD41 2009-11-10 08:46:27 -08:00
Elliott Hughes
03ead3365d 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.)
2009-11-09 23:49:43 -08:00
Doug Zongker
f17e63879c 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.
2009-11-09 18:19:48 -08:00
Steve Block
3be0640ad1 Clean libwebkit, libjs and libv8 after WebKit merge.
Change-Id: I2bba18843aa31b849de53e047dceb40de5eccc8a
2009-11-10 02:17:14 +00:00
Android Code Review
152b98fb7f Merge change Ia3f2b98b
* changes:
  Cosmetic fixes in css/js
2009-11-09 16:13:28 -08:00
Xavier Ducrohet
9dd765ff2c am ebbb0d45: am 38c09a03: am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit 'ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce'

* commit 'ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce':
  Add Livewallpapers picker to SDK.
2009-11-09 13:49:21 -08:00
Xavier Ducrohet
77edd503af am a6f2b447: am 07cca294: am 58302409: Add CertInstaller to the SDK.
Merge commit 'a6f2b447090db78eb8d7a5097f1e182bca271961'

* commit 'a6f2b447090db78eb8d7a5097f1e182bca271961':
  Add CertInstaller to the SDK.
2009-11-09 13:49:18 -08:00
Android (Google) Code Review
c967829807 Merge change I573364cd
* changes:
  Fix the host rule for building executables on darwin-x86.
2009-11-09 13:19:32 -08:00
Xavier Ducrohet
ebbb0d45d7 am 38c09a03: am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841' into eclair-mr2-plus-aosp

* commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841':
  Add Livewallpapers picker to SDK.
2009-11-09 12:14:45 -08:00
Xavier Ducrohet
a6f2b44709 am 07cca294: am 58302409: Add CertInstaller to the SDK.
Merge commit '07cca294a362450a5fc86e372d77503daab11eb1' into eclair-mr2-plus-aosp

* commit '07cca294a362450a5fc86e372d77503daab11eb1':
  Add CertInstaller to the SDK.
2009-11-09 12:14:42 -08:00
Jean-Baptiste Queru
f43b38da71 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
2009-11-09 12:07:48 -08:00
Xavier Ducrohet
38c09a0319 am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-mr2

* commit '216faf3f1c2c8857ad7e88e860897766c830ce31':
  Add Livewallpapers picker to SDK.
2009-11-09 11:59:56 -08:00
Xavier Ducrohet
07cca294a3 am 58302409: Add CertInstaller to the SDK.
Merge commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2

* commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a':
  Add CertInstaller to the SDK.
2009-11-09 11:59:51 -08:00
Xavier Ducrohet
b29ce14e0d am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-plus-aosp

* commit '216faf3f1c2c8857ad7e88e860897766c830ce31':
  Add Livewallpapers picker to SDK.
2009-11-09 11:49:30 -08:00
Xavier Ducrohet
9eaacfd550 am 58302409: Add CertInstaller to the SDK.
Merge commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-plus-aosp

* commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a':
  Add CertInstaller to the SDK.
2009-11-09 11:49:27 -08:00
Jean-Baptiste Queru
e1b710a5ba merge from open-source master 2009-11-09 10:34:27 -08:00
The Android Automerger
1bc70f1c48 ERD40 2009-11-09 08:36:49 -08:00
The Android Automerger
41ca4fe335 Merge branch 'eclair' into eclair-release 2009-11-09 08:36:32 -08:00
Dan Bornstein
16dc9c38d8 Fix the host rule for building executables on darwin-x86.
Change-Id: I573364cd0c95ce0157e21d3bb4f7e3b13c61dd70
2009-11-08 17:44:01 -08:00
The Android Automerger
59f9869a77 ERD39C 2009-11-08 16:52:31 -08:00
The Android Automerger
b115daae8c Merge branch 'eclair' into eclair-release 2009-11-08 16:52:15 -08:00
Jean-Baptiste Queru
45d32edab0 merge from open-source master 2009-11-08 16:07:30 -08:00
Jean-Baptiste Queru
dd721a7a5c merge from open-source master 2009-11-08 16:07:04 -08:00
Jean-Baptiste Queru
04f7cc171f merge from open-source master 2009-11-08 16:06:29 -08:00
Xavier Ducrohet
216faf3f1c Add Livewallpapers picker to SDK.
Change-Id: If14c073c13b13bdd042e2a48aa867f4fa2be7572
2009-11-08 15:42:25 -08:00
android-build SharedAccount
8a42889364 ERD39B 2009-11-08 15:17:31 -08:00
Android Code Review
61a147e3a6 Merge change I6d9c9295
* changes:
  Added a default to specify an alternative tool chain prefix if needed.
2009-11-08 14:17:01 -08:00