Raphael
4002c9f9d4
am 30f366d2: am 1ef75694: am e5387db7: am d2ad5e31: Merge change I361fb688 into eclair-sdk
...
Merge commit '30f366d23217cb71181353010464e99c9b42115f'
* commit '30f366d23217cb71181353010464e99c9b42115f':
SDK Manager: fix, create temp folder before download
2009-11-14 15:01:55 -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
ab8b6a5afd
am 9552c4f4: am 30a6db9c: am 36449a1e: Merge change Ic2680af0 into eclair
...
Merge commit '9552c4f441dfb322d815c3848161ea6451ac7661'
* commit '9552c4f441dfb322d815c3848161ea6451ac7661':
Cleanup for coverage.
2009-11-13 19:06:44 -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
ce302b53dc
am 60f045e3: am 9c002e9f: am d5165a4b: Merge change I00c840bb into eclair
...
Merge commit '60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6'
* commit '60f045e3b3fb49bceb85389fdaadcaa8b6e17ee6':
Import revised translations.
2009-11-13 18:03:40 -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
20f8ca0d6d
am 1591827e: (-s ours) 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 '1591827e470544eff8057b61c0be51acb8b57b95'
* commit '1591827e470544eff8057b61c0be51acb8b57b95':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+ (do not merge)
2009-11-13 16:41:32 -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
64f061ac40
am d4929cfa: am 250153e8: am 25c6ac63: Merge change I9a181cb7 into eclair
...
Merge commit 'd4929cfa19edd45f5b819400c5e221a2687a294d'
* commit 'd4929cfa19edd45f5b819400c5e221a2687a294d':
Use SWT to write PNG screenshot now that we moved to SWT 3.3+
2009-11-13 15:54:50 -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
Android (Google) Code Review
a7319d7711
Merge change I9bdf6690
...
* changes:
Forces adb root and remount when syncing.
2009-11-13 15:31:49 -08:00
Android (Google) Code Review
8c18c13978
Merge change If6f5beaf
...
* changes:
Improved the search to catch warnings from the build subprocess.
2009-11-13 15:31:23 -08:00
Jean-Baptiste Queru
2c8ead32c7
eclair snapshot
2009-11-13 15:09:24 -08:00
Android Git Automerger
c4d593fa6a
am fc6e75e5: am 228bbae1: am e259566c: Put this change back, false alert with build breakage
...
Merge commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0'
* commit 'fc6e75e533d0ddbb65adb9484a1b9ee89a6246d0':
Put this change back, false alert with build breakage
2009-11-13 13:15:32 -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
0b90f4024d
am 2c97ad64: am 0bf9cdf5: am a9046e41: Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
...
Merge commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d'
* commit '2c97ad648c27d81ba3e5d1c209d2d7efab7a7b5d':
Fix build by Reverting "Remove surface from rs init and handle surfaceChanged correctly."
2009-11-13 11:58:41 -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
Nicolas Catania
2997ec39a2
Forces adb root and remount when syncing.
...
The time it takes is very small to do these 2 operations.
Then sync never fails, even on the a device that has just rebooted.
2009-11-13 10:07:34 -08:00
Nicolas Catania
f6f5beaf64
Improved the search to catch warnings from the build subprocess.
...
The build subprocess' output is buffered (but not line buffered).
As a result partial lines are inserted. If the previous insert ended
in the middle of the pattern we are looking for, the search will fail (end missing).
When the second part is inserted, the search will also fail because this
time we start looking from the middle of the pattern (beginning missing).
To work around that, we always match from the beginning of the line.
2009-11-13 09:52:18 -08:00
Jason Sams
909ea23248
am 5a571291: am 0c0d7d25: am 18e1486a: Remove surface from rs init and handle surfaceChanged correctly.
...
Merge commit '5a571291d38723cc4789bd864b24aa7009b642e6'
* commit '5a571291d38723cc4789bd864b24aa7009b642e6':
Remove surface from rs init and handle surfaceChanged correctly.
2009-11-12 23:20:39 -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
