Doug Zongker
5eec9dd20f
am da2d06bb
: am c18736b1
: remember device-specific releasetools extensions in target-files
...
Merge commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412'
* commit 'da2d06bb1cf18762257b4f38f698f6d27d6c4412':
remember device-specific releasetools extensions in target-files
2009-10-01 12:10:52 -07:00
Andy McFadden
d5c079ee27
am 27c6f996
: am c3c136c4
: Merge change I95ed76bd into eclair
...
Merge commit '27c6f996e9636d6af27a72c4817d082151bc1dea'
* commit '27c6f996e9636d6af27a72c4817d082151bc1dea':
Update usage and readme for zipalign.
2009-10-01 11:17:31 -07:00
android-build SharedAccount
16d7016bed
ERD01
2009-10-01 08:49:59 -07:00
android-build SharedAccount
6f9003b565
Merge commit 'goog/eclair' into eclair-release
2009-10-01 08:43:38 -07:00
Xavier Ducrohet
814f2a7bc8
am d5e2f322
: Merge change I57500a81 into eclair
...
Merge commit 'd5e2f32239edf1abde61d6abb9d4f74bbe824464' into eclair-plus-aosp
* commit 'd5e2f32239edf1abde61d6abb9d4f74bbe824464':
Add assets from all density to the SDK system image.
2009-09-30 21:17:20 -07:00
Android (Google) Code Review
d5e2f32239
Merge change I57500a81 into eclair
...
* changes:
Add assets from all density to the SDK system image.
2009-09-30 22:58:34 -04:00
Xavier Ducrohet
e63137869d
Add assets from all density to the SDK system image.
...
Change-Id: I57500a81607edf04337f0a0a75077c00d6d17274
2009-09-30 17:20:11 -07:00
Scott Main
95035daffb
am 39715e2f
: Merge change I962d468d into eclair
...
Merge commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9' into eclair-plus-aosp
* commit '39715e2f3d19e5b9d6ba8b37643c4417dcaabcd9':
revise the deprecated warning to use the 'caution'
2009-09-30 15:33:55 -07:00
Android (Google) Code Review
39715e2f3d
Merge change I962d468d into eclair
...
* changes:
revise the deprecated warning to use the 'caution' style and add a line break
2009-09-30 18:23:08 -04:00
android-build SharedAccount
33274507a5
ERC92B
2009-09-30 15:22:35 -07:00
Scott Main
962d468d73
revise the deprecated warning to use the 'caution'
...
style and add a line break
2009-09-30 14:37:32 -07:00
Jason Chen
a7aca39c5b
am 8d7955dc
: Merge change Ie3f5cd4a into eclair
...
Merge commit '8d7955dcefec28bf86121e693355bcea882665c3' into eclair-plus-aosp
* commit '8d7955dcefec28bf86121e693355bcea882665c3':
Clean steps for a product configuration change.
2009-09-30 13:29:18 -07:00
Android (Google) Code Review
8d7955dcef
Merge change Ie3f5cd4a into eclair
...
* changes:
Clean steps for a product configuration change.
2009-09-30 16:20:41 -04:00
Jason Chen
e3f5cd4a25
Clean steps for a product configuration change.
...
Cleans up intermediates produced for a prebuilt app
included in some product configurations.
2009-09-30 12:25:55 -07:00
Mike Ritter
239e9f2671
Bug in Mac build where it gets confused over case, fix no longer needed.
...
(cherry picked from commit e44fadeb49
)
2009-09-30 12:09:19 -07:00
Xavier Ducrohet
5feb053ca7
am f01a53b6
: am 1933782f
: Remove kickback/talkback/soundback from SDK.
...
Merge commit 'f01a53b67b72de3e4f27bd3103d7223636683e74' into eclair-plus-aosp
* commit 'f01a53b67b72de3e4f27bd3103d7223636683e74':
Remove kickback/talkback/soundback from SDK.
2009-09-30 11:43:35 -07:00
Dirk Dougherty
8fd5fb34ab
am 96dcc3a9
: am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4' into eclair-plus-aosp
* commit '96dcc3a98edfc8e4ed9d6ef851112927b05d71f4':
Add NDK version reference to template.
2009-09-30 11:43:32 -07:00
Xavier Ducrohet
f01a53b67b
am 1933782f
: Remove kickback/talkback/soundback from SDK.
...
Merge commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe' into eclair
* commit '1933782fc0a1ec2bddaf0b851b2fa32994e2d3fe':
Remove kickback/talkback/soundback from SDK.
2009-09-30 11:32:13 -07:00
Dirk Dougherty
96dcc3a98e
am 7259bae0
: Merge change Ied94685e into donut
...
Merge commit '7259bae08d7915c0d5ba6427c815d7576c0ef045' into eclair
* commit '7259bae08d7915c0d5ba6427c815d7576c0ef045':
Add NDK version reference to template.
2009-09-30 11:32:09 -07:00
Doug Zongker
da2d06bb1c
am c18736b1
: remember device-specific releasetools extensions in target-files
...
Merge commit 'c18736b1a777c386dc3c5e3f878249770b5edd78' into eclair-plus-aosp
* commit 'c18736b1a777c386dc3c5e3f878249770b5edd78':
remember device-specific releasetools extensions in target-files
2009-09-30 10:18:57 -07:00
Doug Zongker
c18736b1a7
remember device-specific releasetools extensions in target-files
...
Store the location of the releasetools extensions in the target-files
zip, and make ota_from_target_files use that stored location by
default (though it can still be overridden with -s if desired).
2009-09-30 09:20:32 -07:00
The Android Open Source Project
795eae2add
ERC92
2009-09-30 08:37:42 -07:00
The Android Open Source Project
9478cfae43
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-30 08:37:21 -07:00
Xavier Ducrohet
1933782fc0
Remove kickback/talkback/soundback from SDK.
...
These apps are not in the AOSP tree and cannot be part of the standard SDK
build.
They are available at http://code.google.com/p/eyes-free/
2009-09-29 18:11:05 -07:00
android-build SharedAccount
f882fabcb0
ERC91B
2009-09-29 14:59:34 -07:00
Andy McFadden
27c6f996e9
am c3c136c4
: Merge change I95ed76bd into eclair
...
Merge commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f' into eclair-plus-aosp
* commit 'c3c136c4cd5ad5f21e29511b622436518a3c1c9f':
Update usage and readme for zipalign.
2009-09-29 11:41:46 -07:00
Android (Google) Code Review
c3c136c4cd
Merge change I95ed76bd into eclair
...
* changes:
Update usage and readme for zipalign.
2009-09-29 14:31:43 -04:00
Dave Sparks
ae5b51c439
am 4b71f80a
: am 55ad5cc3
: Change default notification to OnTheHunt. Bug 2146688.
...
Merge commit '4b71f80a1fdb464ec45bad4e5ed93bda4587118c'
* commit '4b71f80a1fdb464ec45bad4e5ed93bda4587118c':
Change default notification to OnTheHunt. Bug 2146688.
2009-09-29 11:13:45 -07:00
Nick Pelly
cc1d470e68
am 6cfd4351
: am dfb05e7a
: cleanspek for Bluetooth API change.
...
Merge commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324'
* commit '6cfd4351bb5fb8e1b36fc0ceb3ad3ed36f949324':
cleanspek for Bluetooth API change.
2009-09-29 11:08:37 -07:00
Andy McFadden
95ed76bd3e
Update usage and readme for zipalign.
...
Added the "-c" flag to the README, and added a short description of the
flag meanings to the usage output. Threw in an AOSP copyright one-liner
for good measure.
2009-09-29 10:55:32 -07:00
Marco Nelissen
2bdc7ec9cf
Speed up warn.py about 30x by precompiling all the regular expressions.
2009-09-29 10:19:29 -07:00
Android (Google) Code Review
7259bae08d
Merge change Ied94685e into donut
...
* changes:
Add NDK version reference to template.
2009-09-29 11:43:24 -04:00
The Android Open Source Project
fbee24c55f
ERC91
2009-09-29 08:37:26 -07:00
The Android Open Source Project
ce0f313953
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-29 08:37:12 -07:00
Dave Sparks
4b71f80a1f
am 55ad5cc3
: Change default notification to OnTheHunt. Bug 2146688.
...
Merge commit '55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea' into eclair-plus-aosp
* commit '55ad5cc3e64afe9450ceaee0a25a2e8c0e97efea':
Change default notification to OnTheHunt. Bug 2146688.
2009-09-28 17:43:48 -07:00
Dave Sparks
55ad5cc3e6
Change default notification to OnTheHunt. Bug 2146688.
2009-09-28 17:27:32 -07:00
Nick Pelly
6cfd4351bb
am dfb05e7a
: cleanspek for Bluetooth API change.
...
Merge commit 'dfb05e7a16a98844e4f47d707193fe05f1d3fc13' into eclair-plus-aosp
* commit 'dfb05e7a16a98844e4f47d707193fe05f1d3fc13':
cleanspek for Bluetooth API change.
2009-09-28 13:55:23 -07:00
Nick Pelly
dfb05e7a16
cleanspek for Bluetooth API change.
...
Change-Id: I3bc628b4dae7757aa616f09a69e6c0f6612b7f87
2009-09-28 13:34:07 -07:00
Doug Zongker
7a6f198727
am 2499b8d7
: am 481c4e65
: fix python syntax error
...
Merge commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c'
* commit '2499b8d78087edcac97dff4b2d5dd3f14ee8eb3c':
fix python syntax error
2009-09-28 10:31:10 -07:00
Doug Zongker
2499b8d780
am 481c4e65
: fix python syntax error
...
Merge commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d' into eclair-plus-aosp
* commit '481c4e650fe6cdb9c63ad04b35d221a2856ca48d':
fix python syntax error
2009-09-28 10:20:34 -07:00
Doug Zongker
481c4e650f
fix python syntax error
2009-09-28 10:07:13 -07:00
The Android Open Source Project
21439a6eed
ERC90
2009-09-28 08:33:44 -07:00
Jeff Hamilton
8206868b32
am f568c602
: am d85472a7
: Fix the build. imgdiff.c needed #include <sys/types.h>.
...
Merge commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5'
* commit 'f568c602b5726d4212d3e8712b6b13ff3e5230e5':
Fix the build. imgdiff.c needed #include <sys/types.h>.
2009-09-28 01:06:35 -07:00
android-build SharedAccount
65582b2282
ERC89B
2009-09-27 17:34:14 -07:00
Doug Zongker
1a008b6c31
am 92247b38
: am 7f116185
: add missing include directory
...
Merge commit '92247b3893abca1de15a564592b891be493f9d35'
* commit '92247b3893abca1de15a564592b891be493f9d35':
add missing include directory
2009-09-27 15:42:51 -07:00
Doug Zongker
8c5b435698
am a785cb55
: am 2bd8abc7
: Merge change 27088 into eclair
...
Merge commit 'a785cb55aa40c4bd251a528edb169d6e1a865169'
* commit 'a785cb55aa40c4bd251a528edb169d6e1a865169':
integrate bsdiff into imgdiff, instead of using subprocess
2009-09-27 15:42:34 -07:00
Scott Main
249be1036a
am dfa9bc7a
: am 6159eead
: am afdb6feb
: Merge change 27127 into donut
...
Merge commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c'
* commit 'dfa9bc7ab1106fcd80d85d57ab71e5a402d0e16c':
docs only.
2009-09-27 15:40:02 -07:00
Doug Zongker
b138371377
am f78bee74
: am ea4a3fa3
: Merge change 27066 into eclair
...
Merge commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6'
* commit 'f78bee7494653f900ecfa7a9c618b1c85ffacda6':
parallellize computation of binary patches
2009-09-27 15:36:37 -07:00
The Android Open Source Project
3ce973089d
ERC89
2009-09-27 09:02:26 -07:00
The Android Open Source Project
de1a115812
Merge commit 'remotes/goog/eclair' into eclair-release
2009-09-27 09:02:12 -07:00