Commit Graph

2223 Commits

Author SHA1 Message Date
Dan Egnor
576714fdb9 am 1a0b304f: am 573205f4: Remove external/googleclient (the code moved elsewhere)
Merge commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81'

* commit '1a0b304faca9a1977f1fe1b44d089a4b01593c81':
  Remove external/googleclient (the code moved elsewhere)
2009-11-17 23:09:24 -08:00
Raphael
a62a442129 Fix the Windows SDK build for the development to sdk split.
Change-Id: Iabeee6aa319a3d98d05357f508b190ba65196df7
2009-11-17 22:12:33 -08:00
Dan Egnor
1a0b304fac am 573205f4: Remove external/googleclient (the code moved elsewhere)
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp

* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
  Remove external/googleclient (the code moved elsewhere)
2009-11-17 22:00:06 -08:00
Dan Egnor
573205f483 Remove external/googleclient (the code moved elsewhere) 2009-11-17 21:28:09 -08:00
Dan Bornstein
58226c0825 am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2
Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3'

* commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3':
  Add the example test to the CTS.
2009-11-17 16:38:57 -08:00
Dan Bornstein
39b99e4f59 am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp

* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
  Add the example test to the CTS.
2009-11-17 16:35:22 -08:00
Dan Bornstein
34ce59147c resolved conflicts for merge of c3d9645e to eclair-mr2 2009-11-17 16:27:02 -08:00
Dan Bornstein
189b528d26 am c3d9645e: Merge change I392672f1 into eclair
Merge commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp

* commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229':
  Add the example test to the CTS.
2009-11-17 15:42:56 -08:00
Android (Google) Code Review
c3d9645e29 Merge change I392672f1 into eclair
* changes:
  Add the example test to the CTS.
2009-11-17 15:39:46 -08:00
Xavier Ducrohet
1ae9880407 Change where makefile looks for sdk_clean.sh 2009-11-17 15:10:41 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00
The Android Automerger
7e0ddc1578 ERD48 2009-11-17 08:55:24 -08:00
The Android Automerger
ecae0115aa Merge branch 'eclair' into eclair-release 2009-11-17 08:54:55 -08:00
Adam Bliss
cb3e80cd55 am 3a4b4985: am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027'

* commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027':
  Enables nodpi drawables in the framework.
2009-11-17 07:35:29 -08:00
Adam Bliss
3a4b4985ed am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp

* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
  Enables nodpi drawables in the framework.
2009-11-16 20:00:57 -08:00
Adam Bliss
0774bf3ebd am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
2009-11-16 19:56:34 -08:00
Adam Bliss
55823d3a08 am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
2009-11-16 18:59:04 -08:00
The Android Automerger
0fda10ae76 ERD47B 2009-11-16 18:33:48 -08:00
Adam Bliss
580cdbe0fe Enables nodpi drawables in the framework. 2009-11-16 17:18:40 -08:00
The Android Automerger
abab474650 ERD47 2009-11-16 08:55:20 -08:00
Jean-Baptiste Queru
9ecac945c1 am efe211de: merge from open-source master
Merge commit 'efe211de2fd3b7c427e69496c708542d660d29c0'

* commit 'efe211de2fd3b7c427e69496c708542d660d29c0':
  eclair snapshot
2009-11-15 15:03:23 -08:00
Jean-Baptiste Queru
efe211de2f merge from open-source master 2009-11-15 14:55:00 -08:00
Jean-Baptiste Queru
4a1dcd3c3c merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:05:55 -08:00
Jean-Baptiste Queru
57556ffcc3 merge from eclair 2009-11-15 12:05:33 -08:00
Jean-Baptiste Queru
8a9098d4fb am 905da31a: merge from open-source master
Merge commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3'

* commit '905da31a24479c559f88dfb46fb6dc94fb5c42b3':
  Cosmetic fixes in css/js
2009-11-15 11:30:42 -08:00
Jean-Baptiste Queru
905da31a24 merge from open-source master 2009-11-15 10:58:56 -08:00
The Android Automerger
46eb8a7edc ERD46 2009-11-15 09:05:43 -08:00
The Android Automerger
94627ed9c1 ERD44B 2009-11-13 13:13:12 -08:00
Christopher Tate
87cffba830 am 218c6d34: am 014b8e03: am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d'

* commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d':
  Add a host shell function to generate system_server stack traces
2009-11-13 10:55:33 -08:00
Dianne Hackborn
73053721a0 am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair
Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
  Fix issue #2258571: Fix build versions
2009-11-13 10:55:29 -08:00
Xavier Ducrohet
ca41c3c71e am e43eb27f: am 2bfaec8d: am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'e43eb27fc0ff883e83cdf4ff9b9bc403bff120be'

* commit 'e43eb27fc0ff883e83cdf4ff9b9bc403bff120be':
  Add the sdk overlay to the build.
2009-11-13 10:55:26 -08:00
Christopher Tate
218c6d3464 am 014b8e03: am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '014b8e0372d85b88eb647be690ae31c6213628bd' into eclair-mr2-plus-aosp

* commit '014b8e0372d85b88eb647be690ae31c6213628bd':
  Add a host shell function to generate system_server stack traces
2009-11-13 10:41:04 -08:00
Dianne Hackborn
265425746b am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair
Merge commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934' into eclair-mr2-plus-aosp

* commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934':
  Fix issue #2258571: Fix build versions
2009-11-13 10:41:01 -08:00
Xavier Ducrohet
e43eb27fc0 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.
2009-11-13 10:40:51 -08:00
Christopher Tate
014b8e0372 am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-mr2

* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
  Add a host shell function to generate system_server stack traces
2009-11-13 09:08:38 -08:00
Dianne Hackborn
8feaa2b67f am d0b22902: Merge change I847e8ab8 into eclair
Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions
2009-11-13 09:08:34 -08:00
Christopher Tate
a6e72ded88 am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-plus-aosp

* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
  Add a host shell function to generate system_server stack traces
2009-11-13 09:08:30 -08:00
Xavier Ducrohet
2bfaec8d32 am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.
2009-11-13 09:08:30 -08:00
Dianne Hackborn
8d9c211a12 am d0b22902: Merge change I847e8ab8 into eclair
Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-plus-aosp

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions
2009-11-13 09:08:26 -08:00
Xavier Ducrohet
69a8ac1d76 am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-plus-aosp

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.
2009-11-13 09:08:22 -08:00
The Android Automerger
25d24b21aa ERD44 2009-11-13 08:39:33 -08:00
The Android Automerger
21e858e9f1 Merge branch 'eclair' into eclair-release 2009-11-13 08:38:53 -08:00
Jean-Baptiste Queru
e6b4e5b20a eclair snapshot 2009-11-13 07:31:05 -08:00
android-build SharedAccount
57eb67da39 ERD43C 2009-11-12 18:26:33 -08:00
Android (Google) Code Review
eb71bf7b74 Merge change I01d9d733 into eclair
* changes:
  Add a host shell function to generate system_server stack traces
2009-11-12 16:46:35 -08:00
Android (Google) Code Review
d0b2290257 Merge change I847e8ab8 into eclair
* changes:
  Fix issue #2258571: Fix build versions
2009-11-12 16:28:03 -08:00
Android (Google) Code Review
c725b6ee0c Merge change I4d3d08a1 into eclair
* changes:
  Add the sdk overlay to the build.
2009-11-12 16:20:00 -08:00
Dianne Hackborn
f6295cdd82 Fix issue #2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -08:00
Christopher Tate
744ee8025a Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process.  Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).

Depends on adb having been configured to run as root.

Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
2009-11-12 15:33:08 -08:00
android-build SharedAccount
682123a5a7 ERD43B 2009-11-12 14:48:10 -08:00