Commit Graph

1048 Commits

Author SHA1 Message Date
Android (Google) Code Review dc54d239a2 Merge change I29b5b2d9
* changes:
  Add new tabs for Compatibility and Get Source to source.android.com framework
2009-10-13 11:51:30 -04:00
Sriram Raman ca02204ddb am 2bd9027d: Merge change I5bbd2294 into eclair-mr2
Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
  For Ying Wang:
2009-10-12 12:42:05 -07:00
Doug Zongker 441dd2b016 am 160028f8: am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit '160028f8325e9e1face3fc6f17baef498ee3e53d'

* commit '160028f8325e9e1face3fc6f17baef498ee3e53d':
  move recovery image to the top of the OTA package
2009-10-12 12:40:19 -07:00
Jeff Hamilton 042ad44dd8 am ce017f01: am 979d5567: Merge change I6b350185 into eclair
Merge commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695'

* commit 'ce017f01d006d3e953f3a38f9489360ecd5d0695':
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-12 12:31:01 -07:00
Joe Onorato a5ed6af74d am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-12 12:30:57 -07:00
Dianne Hackborn c2289d10cc am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-12 12:26:59 -07:00
Mike Ritter 8799ed2200 am ad37305e: am c51aa3bd: am 69625548: Merge change I239e9f26 into donut
Merge commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3'

* commit 'ad37305edb98df08d71fd27e7d1df6a082a76da3':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-12 11:43:13 -07:00
Brett Chabot 392bda6e09 am 66e0c458: Merge change I7bc67c51 into eclair-mr2
Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
  Manual merge of donut-gms cts.mk changes.
2009-10-12 11:41:46 -07:00
Marco Nelissen a470587e5c am fb74a21f: am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'fb74a21f4792e08c1ebee5d0347698885e31d805'

* commit 'fb74a21f4792e08c1ebee5d0347698885e31d805':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-12 11:41:42 -07:00
Joe Onorato 523d6fa026 am f13231ef: am ea79e65f: Merge change Ib7704386 into eclair
Merge commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5'

* commit 'f13231ef8afc6eb2f1ffc14a61d106daa5be8de5':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
2009-10-12 11:41:39 -07:00
Scott Main 67484da8a7 am b268d30a: am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289'

* commit 'b268d30a5b32a8080992fbf39d825f5ccf5c5289':
  docs only.
2009-10-12 11:41:10 -07:00
Gaurav Mathur 29b5b2d94f Add new tabs for Compatibility and Get Source to source.android.com framework 2009-10-08 23:54:35 -07:00
Android (Google) Code Review 2bd9027d0a Merge change I5bbd2294 into eclair-mr2
* changes:
  For Ying Wang:
2009-10-07 21:09:17 -04:00
Doug Zongker 160028f832 am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package
2009-10-07 17:19:28 -07:00
Doug Zongker f2b32f2a4b resolved conflicts for merge of cfd7db6d to eclair 2009-10-07 17:05:36 -07:00
Sriram Raman 5bbd2294e9 For Ying Wang:
Fix "argument list too long" build error bug.
2009-10-07 16:27:38 -07:00
Doug Zongker cfd7db6d84 move recovery image to the top of the OTA package
Make the recovery image be the first thing installed in system/ in the
OTA package, so it will get installed even if the system partition
fills during OTA installation.
2009-10-07 16:26:00 -07:00
Jeff Hamilton ce017f01d0 am 979d5567: Merge change I6b350185 into eclair
Merge commit '979d5567b72b4f3a8219b4786f9f512601645121' into eclair-mr2

* commit '979d5567b72b4f3a8219b4786f9f512601645121':
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-07 11:38:17 -07:00
Joe Onorato cb9102e056 am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-07 11:37:52 -07:00
Android (Google) Code Review 979d5567b7 Merge change I6b350185 into eclair
* changes:
  Add a cleanspec rule for the change to bump the API version to 5.
2009-10-07 14:05:28 -04:00
Joe Onorato 0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00
Jeff Hamilton c171f00fc7 Add a cleanspec rule for the change to bump the API version to 5.
Change-Id: I6b35018552b3a9fc2016f054c8a3c2feb41bc0ad
2009-10-07 00:30:19 -05:00
Dianne Hackborn de7e9e6e8f am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b' into eclair-mr2

* commit '0187d84264fb6cf67650354c8c5da0a0712dbb0b':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-06 19:22:41 -07:00
Dianne Hackborn 0187d84264 Part of issue #2168428: STOP SHIP: Bump API version to 5
This bumps the API version.  We are still going to be an Eclair
development version until prebuilts are updated.

Change-Id: Ie76f3cda15b6c2c0b924db614e8024c04ce5a035
2009-10-06 17:22:49 -07:00
Mike Ritter ad37305edb am c51aa3bd: am 69625548: Merge change I239e9f26 into donut
Merge commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a' into eclair-mr2

* commit 'c51aa3bd0d4dab1e8d842db4afd6053e0111d84a':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-06 11:57:51 -07:00
Mike Ritter c51aa3bd0d am 69625548: Merge change I239e9f26 into donut
Merge commit '69625548bf020685cdcb57dffe8f34aba80f11e5' into eclair

* commit '69625548bf020685cdcb57dffe8f34aba80f11e5':
  Bug in Mac build where it gets confused over case, fix no longer needed.
2009-10-06 11:46:36 -07:00
Android (Google) Code Review 69625548bf Merge change I239e9f26 into donut
* changes:
  Bug in Mac build where it gets confused over case, fix no longer needed. (cherry picked from commit e44fadeb49)
2009-10-06 14:36:51 -04:00
Android (Google) Code Review 66e0c458ae Merge change I7bc67c51 into eclair-mr2
* changes:
  Manual merge of donut-gms cts.mk changes.
2009-10-06 14:09:28 -04:00
Marco Nelissen fb74a21f47 am f885d876: Merge change I2bdc7ec9 into eclair
Merge commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59' into eclair-mr2

* commit 'f885d876a273bc76b0f5a35c9ea2346f4a5b4d59':
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 11:00:32 -07:00
Joe Onorato f13231ef8a am ea79e65f: Merge change Ib7704386 into eclair
Merge commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9' into eclair-mr2

* commit 'ea79e65fc656351ffeae1daa2cc40abba05d56b9':
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
2009-10-06 11:00:28 -07:00
Android (Google) Code Review f885d876a2 Merge change I2bdc7ec9 into eclair
* changes:
  Speed up warn.py about 30x by precompiling all the regular expressions.
2009-10-06 13:48:38 -04:00
Android (Google) Code Review ea79e65fc6 Merge change Ib7704386 into eclair
* changes:
  BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default, and put the commonly used options at the top.
2009-10-06 13:31:06 -04:00
Scott Main b268d30a5b am 5f0241f5: am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '5f0241f5d8da1db2721c19d7629115a6c1c71639' into eclair-mr2

* commit '5f0241f5d8da1db2721c19d7629115a6c1c71639':
  docs only.
2009-10-06 10:26:04 -07:00
Scott Main 5f0241f5d8 am 37bfad5c: docs only. fix FF2 browser bug in header layout
Merge commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d' into eclair

* commit '37bfad5ce8cc5d2c52ca75770b1c8e895e198e9d':
  docs only.
2009-10-06 10:14:01 -07:00
Scott Main 37bfad5ce8 docs only.
fix FF2 browser bug in header layout

http://b/2031559

Change-Id: I251364b9abe0d1a05eda1febdd0f7942e2e610e1
2009-10-06 09:27:10 -07:00
android-build SharedAccount 86ade70fa3 am 16d088ec: (-s ours) set BUILD_ID, do not merge
Merge commit '16d088ec1e02d85f318b4657db91fe0145db67d3'

* commit '16d088ec1e02d85f318b4657db91fe0145db67d3':
  set BUILD_ID, do not merge
2009-10-06 02:11:35 -07:00
Joe Onorato 582b21e87e BUILD SYSTEM ONLY - Add TARGET_BUILD_VARIANT to buildspec.mk.default,
and put the commonly used options at the top.
2009-10-05 10:06:54 -07:00
Brett Chabot 7bc67c5114 Manual merge of donut-gms cts.mk changes. 2009-10-02 11:09:41 -07:00
android-build SharedAccount 16d088ec1e set BUILD_ID, do not merge 2009-10-02 08:01:02 -07:00
Xavier Ducrohet 3f54a5523d am 814f2a7b: am d5e2f322: Merge change I57500a81 into eclair
Merge commit '814f2a7bc8db7271c5c1ff410af30458cf105546'

* commit '814f2a7bc8db7271c5c1ff410af30458cf105546':
  Add assets from all density to the SDK system image.
2009-10-01 13:47:17 -07:00
Scott Main 07dc76fee2 am 95035daf: am 39715e2f: Merge change I962d468d into eclair
Merge commit '95035daffba91e776734c927c01d104c4478bd9e'

* commit '95035daffba91e776734c927c01d104c4478bd9e':
  revise the deprecated warning to use the 'caution'
2009-10-01 12:22:34 -07:00
Jason Chen 8aa913d35b am a7aca39c: am 8d7955dc: Merge change Ie3f5cd4a into eclair
Merge commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca'

* commit 'a7aca39c5b9d8cd626b30fb4f2e6f304163373ca':
  Clean steps for a product configuration change.
2009-10-01 12:16:51 -07:00
Xavier Ducrohet 8251c40f2a am 5feb053c: am f01a53b6: am 1933782f: Remove kickback/talkback/soundback from SDK.
Merge commit '5feb053ca7b92e85f5e52e5674b60885edc016e7'

* commit '5feb053ca7b92e85f5e52e5674b60885edc016e7':
  Remove kickback/talkback/soundback from SDK.
2009-10-01 12:13:34 -07:00
Dirk Dougherty dfea61dedb am 8fd5fb34: am 96dcc3a9: am 7259bae0: Merge change Ied94685e into donut
Merge commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9'

* commit '8fd5fb34abdbdb76f8b5970082b4aab4d41d6bf9':
  Add NDK version reference to template.
2009-10-01 12:13:30 -07:00
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
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