Android (Google) Code Review
13dbc2272e
Merge change I62823795 into eclair
...
* changes:
Move source.properties for doc in sync with 2.0.1
2009-11-15 13:22:41 -08:00
Xavier Ducrohet
5434eb4f36
am 05ae5d65: Merge change I229c60a9 into eclair
...
Merge commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff' into eclair-plus-aosp
* commit '05ae5d65fdea59ad8ccf6d5538a93f5e202d2bff':
Move source.properties for platform in sync with 2.0.1
2009-11-15 13:18:30 -08:00
Xavier Ducrohet
a6bd846ac8
Move source.properties for doc in sync with 2.0.1
...
Change-Id: I6282379532159de597aaec50cad81b14a0c895ce
2009-11-15 13:16:01 -08:00
Android (Google) Code Review
05ae5d65fd
Merge change I229c60a9 into eclair
...
* changes:
Move source.properties for platform in sync with 2.0.1
2009-11-15 13:14:47 -08:00
Xavier Ducrohet
3423617276
Move source.properties for platform in sync with 2.0.1
...
Change-Id: I229c60a97138c70bb9b27bd0aa60670b882cb711
2009-11-15 12:52:56 -08:00
Jean-Baptiste Queru
2cd508f9c4
merge from eclair
2009-11-15 12:05:39 -08:00
Raphael
30f366d232
am 1ef75694: am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit '1ef756940f7292987a32eeab656fc8737171dc03' into eclair-mr2-plus-aosp
* commit '1ef756940f7292987a32eeab656fc8737171dc03':
SDK Manager: fix, create temp folder before download
2009-11-14 14:55:28 -08:00
Raphael
f5ce1fdb00
am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-plus-aosp
* commit 'e5387db7c2dabc9954434494054295f45e86e312':
SDK Manager: fix, create temp folder before download
2009-11-14 14:50:13 -08:00
Raphael
1ef756940f
am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit 'e5387db7c2dabc9954434494054295f45e86e312' into eclair-mr2
* commit 'e5387db7c2dabc9954434494054295f45e86e312':
SDK Manager: fix, create temp folder before download
2009-11-14 14:49:14 -08:00
Raphael
e5387db7c2
am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6' into eclair
* commit 'd2ad5e31b829f609c76f2352cbdb964c0a4434e6':
SDK Manager: fix, create temp folder before download
2009-11-14 14:39:52 -08:00
Android (Google) Code Review
d2ad5e31b8
Merge change I361fb688 into eclair-sdk
...
* changes:
SDK Manager: fix, create temp folder before download
2009-11-14 14:32:27 -08:00
Brett Chabot
9552c4f441
am 30a6db9c: am 36449a1e: Merge change Ic2680af0 into eclair
...
Merge commit '30a6db9cf31c95a6329170dfd5de2e27cfe47b16' into eclair-mr2-plus-aosp
* commit '30a6db9cf31c95a6329170dfd5de2e27cfe47b16':
Cleanup for coverage.
2009-11-13 19:03:51 -08:00
Brett Chabot
30a6db9cf3
am 36449a1e: Merge change Ic2680af0 into eclair
...
Merge commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-mr2
* commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
2009-11-13 19:00:14 -08:00
Brett Chabot
d1855037e9
am 36449a1e: Merge change Ic2680af0 into eclair
...
Merge commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b' into eclair-plus-aosp
* commit '36449a1e14b91a25ae6b3746cb8b1387d2b8157b':
Cleanup for coverage.
2009-11-13 18:59:55 -08:00
Android (Google) Code Review
36449a1e14
Merge change Ic2680af0 into eclair
...
* changes:
Cleanup for coverage.
2009-11-13 18:55:47 -08:00
Brett Chabot
ddbd282dc8
Cleanup for coverage.
...
Fix constructor call in coverage.py
Remove obsolete improvider from coverage targets.
Change-Id: Ic2680af0aa84c705a6bc05a897461eeeaeeeb1cc
2009-11-13 18:33:43 -08:00
Eric Fischer
60f045e3b3
am 9c002e9f: am d5165a4b: Merge change I00c840bb into eclair
...
Merge commit '9c002e9f7a90a769b0656e060d4ec6a0401d7927' into eclair-mr2-plus-aosp
* commit '9c002e9f7a90a769b0656e060d4ec6a0401d7927':
Import revised translations.
2009-11-13 17:59:44 -08:00
Eric Fischer
9c002e9f7a
am d5165a4b: Merge change I00c840bb into eclair
...
Merge commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-mr2
* commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
2009-11-13 17:54:56 -08:00
Eric Fischer
359009015e
am d5165a4b: Merge change I00c840bb into eclair
...
Merge commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf' into eclair-plus-aosp
* commit 'd5165a4b6709a68fc099c8acdf4dfe4b7120adcf':
Import revised translations.
2009-11-13 17:53:36 -08:00
Android (Google) Code Review
d5165a4b67
Merge change I00c840bb into eclair
...
* changes:
Import revised translations.
2009-11-13 17:49:55 -08:00
Eric Fischer
00c840bbf4
Import revised translations.
...
Approver: jerryw
2009-11-13 17:11:59 -08:00
Xavier Ducrohet
1591827e47
am 37339c2a: am b92c8a90: (-s ours) am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit '37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a' into eclair-mr2-plus-aosp
* commit '37339c2afcf2658868cf1c6e0c5cbe8c700b7a6a':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:35:35 -08:00
Xavier Ducrohet
37339c2afc
am b92c8a90: (-s ours) am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-mr2
* commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:32:07 -08:00
Xavier Ducrohet
70d007f8c2
am b92c8a90: am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5' into eclair-plus-aosp
* commit 'b92c8a9055f76b5c741add7d2f5562052c5024c5':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:31:33 -08:00
Xavier Ducrohet
b92c8a9055
am 7e48a700: (-s ours) Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
Merge commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1' into eclair
* commit '7e48a7003ad28f8b45a45a24fc479b3a237727f1':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:27:51 -08:00
Xavier Ducrohet
7e48a7003a
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
...
BUG 2256562
This is integrated from eclair
2009-11-13 16:17:12 -08:00
Xavier Ducrohet
d4929cfa19
am 250153e8: am 25c6ac63: Merge change I9a181cb7 into eclair
...
Merge commit '250153e8257188269bb171bb333975860bcc1d36' into eclair-mr2-plus-aosp
* commit '250153e8257188269bb171bb333975860bcc1d36':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:50:56 -08:00
Xavier Ducrohet
250153e825
am 25c6ac63: Merge change I9a181cb7 into eclair
...
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-mr2
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:46:56 -08:00
Xavier Ducrohet
88888e9c68
am 25c6ac63: Merge change I9a181cb7 into eclair
...
Merge commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0' into eclair-plus-aosp
* commit '25c6ac6391cef936b6ded5c6eaad7d59857cebd0':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:46:34 -08:00
Android (Google) Code Review
25c6ac6391
Merge change I9a181cb7 into eclair
...
* changes:
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:42:46 -08:00
Jean-Baptiste Queru
2c8ead32c7
eclair snapshot
2009-11-13 15:09:24 -08:00
Android Git Automerger
fc6e75e533
am 228bbae1: am e259566c: Put this change back, false alert with build breakage
...
Merge commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b' into eclair-mr2-plus-aosp
* commit '228bbae1e312c525f52648d2ff4f4ed597d82a7b':
Put this change back, false alert with build breakage
2009-11-13 13:11:09 -08:00
Android Git Automerger
228bbae1e3
am e259566c: Put this change back, false alert with build breakage
...
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-mr2
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
2009-11-13 13:06:11 -08:00
Android Git Automerger
7dd5ef8e4d
am e259566c: Put this change back, false alert with build breakage
...
Merge commit 'e259566cef64e41a6c4228c2a80abd124e94e39c' into eclair-plus-aosp
* commit 'e259566cef64e41a6c4228c2a80abd124e94e39c':
Put this change back, false alert with build breakage
2009-11-13 12:30:30 -08:00
Android Git Automerger
e259566cef
Put this change back, false alert with build breakage
...
This reverts commit a9046e418e
2009-11-13 12:26:06 -08:00
Android Git Automerger
2c97ad648c
am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
Merge commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb' into eclair-mr2-plus-aosp
* commit '0bf9cdf569c9e34704e5dad6e858aa8cb8f6a5bb':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:55:32 -08:00
Android Git Automerger
b1d3968228
am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
Merge commit 'a9046e418e539e208af6f3723a513666074ec6a1' into eclair-plus-aosp
* commit 'a9046e418e539e208af6f3723a513666074ec6a1':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:51:11 -08:00
Android Git Automerger
0bf9cdf569
am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
Merge commit 'a9046e418e539e208af6f3723a513666074ec6a1' into eclair-mr2
* commit 'a9046e418e539e208af6f3723a513666074ec6a1':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:50:47 -08:00
Android Git Automerger
a9046e418e
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
This reverts commit 18e1486a27
2009-11-13 11:40:40 -08:00
Jason Sams
5a571291d3
am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
...
Merge commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5' into eclair-mr2-plus-aosp
* commit '0c0d7d25fd7332e6562f99dae0ae823bc84bdfd5':
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:14:43 -08:00
Jason Sams
0c0d7d25fd
am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
...
Merge commit '18e1486a2749055414579f487b125021eb79b8ca' into eclair-mr2
* commit '18e1486a2749055414579f487b125021eb79b8ca':
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:07:33 -08:00
Jason Sams
d0768ced80
am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
...
Merge commit '18e1486a2749055414579f487b125021eb79b8ca' into eclair-plus-aosp
* commit '18e1486a2749055414579f487b125021eb79b8ca':
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 19:11:15 -08:00
Raphael
3298a0438e
SDK Manager: fix, create temp folder before download
...
SDK BUG 2258237
Change-Id: I361fb688558539e20af50cd0a1d805ddf4ea4828
2009-11-12 17:15:54 -08:00
Jason Sams
18e1486a27
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 15:08:27 -08:00
Xavier Ducrohet
75e9110f13
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
...
BUG 2256562
Change-Id: I9a181cb799b1eadc027d6357c100fc4dfb0db012
2009-11-12 13:30:02 -08:00
Brett Chabot
ca603e23d3
am b2876c0c: am cf87c98a: Add contacts launch performance test definition.
...
Merge commit 'b2876c0c46107aadabd0ccc2f1b10c04f4c2f169' into eclair-mr2-plus-aosp
* commit 'b2876c0c46107aadabd0ccc2f1b10c04f4c2f169':
Add contacts launch performance test definition.
2009-11-12 12:08:18 -08:00
Xavier Ducrohet
0034543d23
am 7ec1c45b: am c84040c1: Merge change I6fd4cd01 into eclair
...
Merge commit '7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4' into eclair-mr2-plus-aosp
* commit '7ec1c45b3ae47e9c9dc594f1478f22ae49cbd0a4':
Add an overlay to make the latinIME the default one in the SDK
2009-11-12 12:08:14 -08:00
Brett Chabot
b2876c0c46
am cf87c98a: Add contacts launch performance test definition.
...
Merge commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f' into eclair-mr2
* commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f':
Add contacts launch performance test definition.
2009-11-12 12:04:10 -08:00
Xavier Ducrohet
7ec1c45b3a
am c84040c1: Merge change I6fd4cd01 into eclair
...
Merge commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394' into eclair-mr2
* commit 'c84040c18ba36b3b265f47a0a0366b33fd86c394':
Add an overlay to make the latinIME the default one in the SDK
2009-11-12 12:04:06 -08:00
Brett Chabot
d1e84dfb5c
am cf87c98a: Add contacts launch performance test definition.
...
Merge commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f' into eclair-plus-aosp
* commit 'cf87c98ad18bdf928dd93a86e04b0f61b477a30f':
Add contacts launch performance test definition.
2009-11-12 12:03:59 -08:00
