Commit Graph

85413 Commits

Author SHA1 Message Date
The Android Open Source Project
682653f72f Merge commit 'remotes/goog/master' into eclair-release 2009-07-31 09:55:32 -07:00
Android (Google) Code Review
c97ea27f86 Merge change 9346
* changes:
  Update warn.py with the latest warnings that popped up in the build.
2009-07-31 09:43:24 -07:00
Marco Nelissen
5236fbde30 Update warn.py with the latest warnings that popped up in the build. 2009-07-31 09:02:11 -07:00
The Android Open Source Project
3c2c2ec800 ERC31 2009-07-31 08:38:35 -07:00
The Android Open Source Project
3351be0cba DRC31 2009-07-31 08:38:17 -07:00
The Android Open Source Project
b6f7fe646c Merge commit 'remotes/goog/master' into eclair-release 2009-07-31 08:38:17 -07:00
Dan Egnor
67dc3d9a99 oops, missed one 2009-07-30 16:53:26 -07:00
Dan Egnor
d51042522a Needed for incremental builds after MD2 removal 2009-07-30 16:23:04 -07:00
Joe Onorato
1de66889ec Don't check build tools versions (including javac) every time make is run.
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
2009-07-30 11:54:27 -07:00
Joe Onorato
ead9646f1f Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
2009-07-30 11:20:04 -07:00
Joe Onorato
2a5d4d81b2 Add cproj function to envsetup.sh that finds an Android.mk and goes to its directory. 2009-07-30 10:24:28 -07:00
The Android Open Source Project
857a865515 DRC30B 2009-07-30 09:29:51 -07:00
The Android Open Source Project
b8027066af ERC30 2009-07-30 08:38:17 -07:00
The Android Open Source Project
b5c065960b DRC30 2009-07-30 08:38:09 -07:00
The Android Open Source Project
0d564a68a4 Merge commit 'remotes/goog/master' into eclair-release 2009-07-30 08:38:00 -07:00
The Android Open Source Project
b196f541f8 Merge commit 'remotes/goog/donut' into donut-release 2009-07-30 08:37:53 -07:00
Android (Google) Code Review
1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Phil Dubach
e7faad965f am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
  CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
Daisuke Miyakawa
cca2cdf1ae am 981bafb1: AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'

* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
  AI 150131: Remove English/Chinese IME from OpenWnn.
2009-07-30 06:56:45 -07:00
Jean-Baptiste Queru
3a37cdf3a2 am 239637ea: (-s ours) findleaves.sh: Properly fix arguments.
Merge commit '239637eac86c8f4f92384891a8f99085039a5778'

* commit '239637eac86c8f4f92384891a8f99085039a5778':
  findleaves.sh: Properly fix arguments.
2009-07-29 16:48:32 -07:00
Android (Google) Code Review
a86afb626f am c16c0a41: Merge change 8942 into donut
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
  Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Scott Main
a7f49e3b95 am df09424f: Patch 2: some fixes to the developer-docs stylesheet.... Patch 3: add "Since:" to the api level info Patch 4: fix packages page and styles to reveal class summary
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'

* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
  Patch 2: some fixes to the developer-docs stylesheet....
2009-07-29 16:44:56 -07:00
Jean-Baptiste Queru
7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Android (Google) Code Review
7ebafd5aa0 Merge change 9009 into donut
* changes:
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-29 13:58:07 -07:00
Android (Google) Code Review
94a7e48086 Merge change 9010
* changes:
  include GoogleContactsSyncAdapter in products with google
2009-07-29 13:55:29 -07:00
Fred Quintana
e4e5b5865a include GoogleContactsSyncAdapter in products with google 2009-07-29 12:47:54 -07:00
Dirk Dougherty
3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Phil Dubach
951f3d89fb CTS: Add telephony and webkit test cases to CTS makefile 2009-07-29 11:58:11 -07:00
Daisuke Miyakawa
981bafb11b AI 150131: Remove English/Chinese IME from OpenWnn.
Automated import of CL 150131
2009-07-29 11:41:01 -07:00
The Android Open Source Project
295b1129e1 ERC29 2009-07-29 08:37:57 -07:00
The Android Open Source Project
db675fa7d4 DRC29 2009-07-29 08:37:52 -07:00
The Android Open Source Project
20c23286d8 Merge commit 'remotes/goog/master' into eclair-release 2009-07-29 08:37:43 -07:00
The Android Open Source Project
f84d16dd82 Merge commit 'remotes/goog/donut' into donut-release 2009-07-29 08:37:37 -07:00
Jean-Baptiste Queru
239637eac8 findleaves.sh: Properly fix arguments.
the first argument is the executable (here findleaves.sh), therefore we
need to start popping from the 2nd argument (1).

Conflicts:

	tools/findleaves.sh
2009-07-29 07:35:15 -07:00
Android (Google) Code Review
c16c0a41f5 Merge change 8942 into donut
* changes:
  Add CTS permission2 test package to cts.
2009-07-28 20:38:42 -07:00
Brett Chabot
7b5edc3e8a Add CTS permission2 test package to cts. 2009-07-28 20:11:24 -07:00
Joe Onorato
cffab81686 Make the product graph slightly more readable. 2009-07-28 18:29:19 -07:00
Scott Main
df09424f19 Patch 2: some fixes to the developer-docs stylesheet....
Patch 3: add "Since:" to the api level info
Patch 4: fix packages page and styles to reveal class summary

Squashed commit of the following:

commit 8fcdcb8dcbe9b93688f5eb1020654848d3242675
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 2423b30ee46c12f92051c4f2a096532e55752c46
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.

commit efd94b33071070f0dfc2045131b81cbdfe078468
Author: Scott Main <smain@google.com>
Date:   Mon Jul 27 09:33:45 2009 -0700

    remove the toggle selector from the header.
    this will be added in a later change with the rest of the toggle script

commit 3fb79313232c993f700ee90a94f59dcca275fb0b
Author: Scott Main <smain@google.com>
Date:   Fri Jul 24 16:29:21 2009 -0700

    Implement API Level styles.
    This changes the way we show the API Level for a given package/class/member.
    It also provides hooks in the document to allow us to restyle items
    based on a user-selected API Level (show/hide available items).
    More changes to provide the toggling feature will come soon.
2009-07-28 09:53:59 -07:00
The Android Open Source Project
4cb7fde4b5 ERC28 2009-07-28 08:38:42 -07:00
The Android Open Source Project
24fdba97a7 DRC28 2009-07-28 08:38:34 -07:00
The Android Open Source Project
157f99121e Merge commit 'remotes/goog/master' into eclair-release 2009-07-28 08:38:27 -07:00
The Android Open Source Project
58f6fbe334 ERC27B 2009-07-27 10:17:16 -07:00
Wei Huang
99b2a774c5 clean step for data messaging api. 2009-07-27 08:46:24 -07:00
The Android Open Source Project
f90757b58e ERC27 2009-07-27 08:38:15 -07:00
The Android Open Source Project
5bcb9b05db DRC27 2009-07-27 08:38:04 -07:00
The Android Open Source Project
646c73ddf0 Merge commit 'remotes/goog/master' into eclair-release 2009-07-27 08:37:57 -07:00
The Android Open Source Project
b616f8d223 Merge commit 'remotes/goog/donut' into donut-release 2009-07-27 08:37:49 -07:00
Jean-Baptiste Queru
7cc41cfadb reconcile korg/master into goog/master 2009-07-26 11:43:53 -07:00
Jean-Baptiste Queru
7c07cf9a82 Merge korg/donut into korg/master
Conflicts:

	core/apicheck_msg_current.txt
	core/combo/linux-arm.mk
	core/prelink-linux-arm.map
	tools/droiddoc/src/ClassInfo.java
2009-07-25 16:58:22 -07:00
Dirk Dougherty
5f07e2908c am 882bbe14: Merge commit \'5db40c6db73db3f4433dd3456107efb4468a4a99\' into manualmergeDroiddoc
Merge commit '882bbe1489518cabb661e06f6e87a6561d9239df'

* commit '882bbe1489518cabb661e06f6e87a6561d9239df':
  AI 150594: change the homepage markup and styles to allow variable height in
  AI 150537: Add support for language-specific tabs in android developer's blog. Pass the current language pref as an hl=lang url query.
  AI 150536: Change the formatting of sdk redirect pages so that they are not language-specific.
  AI 150535: add the Videos page to the site
2009-07-25 10:12:09 -07:00