OSDN Git Service
The Android Open Source Project [Tue, 20 Jul 2010 17:28:35 +0000 (10:28 -0700)]
The Android Open Source Project [Tue, 20 Jul 2010 17:25:37 +0000 (10:25 -0700)]
merge from open-source master
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
Chet Haase [Tue, 20 Jul 2010 17:07:53 +0000 (10:07 -0700)]
Merge "Fix bugs in Sequencer"
Andreas Huber [Tue, 20 Jul 2010 16:33:09 +0000 (09:33 -0700)]
am
4df3ab54: am
faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '
4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'
* commit '
4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Andreas Huber [Tue, 20 Jul 2010 16:24:53 +0000 (09:24 -0700)]
am
faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Merge commit '
faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp
* commit '
faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Andreas Huber [Tue, 20 Jul 2010 16:18:58 +0000 (09:18 -0700)]
Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread
Mike Lockwood [Tue, 20 Jul 2010 16:06:41 +0000 (09:06 -0700)]
Merge "MTP host fixes:"
Shih-wei Liao [Tue, 20 Jul 2010 08:26:34 +0000 (01:26 -0700)]
Merge "Fix Android build"
Shih-wei Liao [Tue, 20 Jul 2010 08:04:58 +0000 (01:04 -0700)]
Merge "Change the include path."
Shih-wei Liao [Tue, 20 Jul 2010 07:37:42 +0000 (00:37 -0700)]
Merge "Port ModelViewer to use the new build system. Fix the simulator build on Fountain."
Ying Wang [Tue, 20 Jul 2010 01:31:45 +0000 (18:31 -0700)]
Merge "Fix build"
Daniel Lehmann [Tue, 20 Jul 2010 01:03:08 +0000 (18:03 -0700)]
Merge "Replace try-catch code by proper type checking. Saves an exception for each blob."
Jack Palevich [Tue, 20 Jul 2010 01:02:36 +0000 (18:02 -0700)]
Merge "Fix extraMath state variable."
Jack Palevich [Tue, 20 Jul 2010 01:01:39 +0000 (18:01 -0700)]
Fix extraMath state variable.
Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd
Ying Wang [Tue, 20 Jul 2010 00:53:01 +0000 (17:53 -0700)]
Merge ".rs files are now built by the build system."
Jack Palevich [Tue, 20 Jul 2010 00:52:52 +0000 (17:52 -0700)]
Merge "Try to handle end-of-application better."
Jack Palevich [Tue, 20 Jul 2010 00:52:12 +0000 (17:52 -0700)]
Try to handle end-of-application better.
Handle rotation from portrait to landscape by restarting test if not
finished.
Don't write blank line to csv file.
Change-Id: I154443138817bcec9530123c8388fcf659632336
Jack Palevich [Tue, 20 Jul 2010 00:40:46 +0000 (17:40 -0700)]
Merge "Write test timings to /sdcard/glperf.csv"
Jack Palevich [Tue, 20 Jul 2010 00:39:52 +0000 (17:39 -0700)]
Write test timings to /sdcard/glperf.csv
Change-Id: If09e209a9d8049f03320dbd7df257137bf06949e
Jack Palevich [Tue, 20 Jul 2010 00:02:26 +0000 (17:02 -0700)]
Merge "Keep screen on for whole test."
Jack Palevich [Tue, 20 Jul 2010 00:01:25 +0000 (17:01 -0700)]
Keep screen on for whole test.
Print only one set of timings per test.
Draw blank black screen when done.
Change-Id: I963bcbca99ff5975683b15e60437978eb1a8beb8
Jamie Gennis [Mon, 19 Jul 2010 23:35:26 +0000 (16:35 -0700)]
am
98f8e0cb: am
ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit '
98f8e0cbaa19b4a045e6f201290e731ddfad67ba'
* commit '
98f8e0cbaa19b4a045e6f201290e731ddfad67ba':
Remove some debug logging that I accidentally committed.
Jamie Gennis [Mon, 19 Jul 2010 23:33:11 +0000 (16:33 -0700)]
am
ff7049ab: Remove some debug logging that I accidentally committed.
Merge commit '
ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp
* commit '
ff7049ab2886acc73e145367118646f7741ce333':
Remove some debug logging that I accidentally committed.
Jack Palevich [Mon, 19 Jul 2010 23:28:56 +0000 (16:28 -0700)]
Merge "An application version of the GL test."
Jack Palevich [Mon, 19 Jul 2010 23:27:54 +0000 (16:27 -0700)]
An application version of the GL test.
Change-Id: Ibcccdf2560eb24d3037c02c4740f0048b60d070c
Mike Lockwood [Mon, 19 Jul 2010 23:09:40 +0000 (16:09 -0700)]
Merge "Add support for emulating external storage on devices with no SD card"
Jamie Gennis [Mon, 19 Jul 2010 23:09:26 +0000 (16:09 -0700)]
Remove some debug logging that I accidentally committed.
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
Winson Chung [Mon, 19 Jul 2010 23:07:33 +0000 (16:07 -0700)]
Merge "Fixing build breakage due to misnamed javadoc variable."
Adam Powell [Mon, 19 Jul 2010 22:52:02 +0000 (15:52 -0700)]
Merge "Fix docs for MenuItem#setShowAsAction"
Adam Powell [Mon, 19 Jul 2010 22:48:53 +0000 (15:48 -0700)]
Merge "Fix bug
2852909 - screen density for contextual action bar"
Jason Sams [Mon, 19 Jul 2010 22:39:05 +0000 (15:39 -0700)]
Merge "Threading RS ForEach."
Mason Tang [Mon, 19 Jul 2010 22:32:45 +0000 (15:32 -0700)]
Merge "Added support for full-text search in Calendar"
Vasu Nori [Mon, 19 Jul 2010 22:32:10 +0000 (15:32 -0700)]
am
3766ed3e: am
a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '
3766ed3eed6be0a9e78193166bab64bf25f02e81'
* commit '
3766ed3eed6be0a9e78193166bab64bf25f02e81':
fix javadoc error which breaks SDK build in gingerbread
Vasu Nori [Mon, 19 Jul 2010 22:29:10 +0000 (15:29 -0700)]
am
a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
Merge commit '
a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp
* commit '
a5fe776a7933b2241858ef83f01b812c7badc231':
fix javadoc error which breaks SDK build in gingerbread
Vasu Nori [Mon, 19 Jul 2010 22:26:39 +0000 (15:26 -0700)]
Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread
The Android Open Source Project [Mon, 19 Jul 2010 22:22:40 +0000 (15:22 -0700)]
am
535f6f67: ignore from open-source master
Merge commit '
535f6f67ecfb16bbdc3d9adf8867e3c91be005fc'
* commit '
535f6f67ecfb16bbdc3d9adf8867e3c91be005fc':
Remove the window from being a target for motion events when it is destroyed.
The Android Open Source Project [Mon, 19 Jul 2010 22:19:44 +0000 (15:19 -0700)]
ignore from open-source master
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
Winson Chung [Mon, 19 Jul 2010 22:02:33 +0000 (15:02 -0700)]
Merge "Initial changes to allow collections in widgets."
Scott Main [Mon, 19 Jul 2010 21:57:29 +0000 (14:57 -0700)]
am
3dfa6ec5: am
945ac54d: am
85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '
3dfa6ec5f3446c0819619aed6accc593f235cdc9'
* commit '
3dfa6ec5f3446c0819619aed6accc593f235cdc9':
docs: add troubleshooting to eclipse guide about restarting adb
Scott Main [Mon, 19 Jul 2010 21:52:35 +0000 (14:52 -0700)]
am
945ac54d: am
85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '
945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp
* commit '
945ac54da56f79c8407c0111d6ded25afcc159fc':
docs: add troubleshooting to eclipse guide about restarting adb
Scott Main [Mon, 19 Jul 2010 21:50:32 +0000 (14:50 -0700)]
am
85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Merge commit '
85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread
* commit '
85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
docs: add troubleshooting to eclipse guide about restarting adb
Scott Main [Mon, 19 Jul 2010 21:42:13 +0000 (14:42 -0700)]
Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Vasu Nori [Mon, 19 Jul 2010 21:13:57 +0000 (14:13 -0700)]
Merge "fix javadoc error"
Danica Chang [Mon, 19 Jul 2010 20:52:38 +0000 (13:52 -0700)]
am
cbbd3a1b: am
f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit '
cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'
* commit '
cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Danica Chang [Mon, 19 Jul 2010 20:50:49 +0000 (13:50 -0700)]
am
f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit '
f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit '
f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Danica Chang [Mon, 19 Jul 2010 20:47:50 +0000 (13:47 -0700)]
Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
John Wang [Mon, 19 Jul 2010 20:42:37 +0000 (13:42 -0700)]
Merge "Handle call list in CallManager."
The Android Open Source Project [Mon, 19 Jul 2010 19:54:10 +0000 (12:54 -0700)]
am
27dfb307: merge from open-source master
Merge commit '
27dfb3070adc90ddfcc398a352de1741f52add03'
* commit '
27dfb3070adc90ddfcc398a352de1741f52add03':
Replaced deprecated calls to setButton and setButton2
The Android Open Source Project [Mon, 19 Jul 2010 19:49:39 +0000 (12:49 -0700)]
merge from open-source master
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
The Android Open Source Project [Mon, 19 Jul 2010 19:48:47 +0000 (12:48 -0700)]
am
9ab60279: merge from open-source master
Merge commit '
9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6'
* commit '
9ab60279fdbf0d9e9279ae74cdc1a223d9785ce6':
Replaced deprecated setButton Methodcalls
Fabrice Di Meglio [Mon, 19 Jul 2010 19:30:01 +0000 (12:30 -0700)]
Merge "Fix bug #
2846543 Delete HIDDEN column from the "Calendars" table"
The Android Open Source Project [Mon, 19 Jul 2010 19:17:53 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
Mike Lockwood [Mon, 19 Jul 2010 18:31:54 +0000 (11:31 -0700)]
Merge "MTP: Only send events to host if we have an open session."
Mike Lockwood [Mon, 19 Jul 2010 18:31:38 +0000 (11:31 -0700)]
Merge "Add MTP_OBJECT_ID column name to MediaStore.MediaColumns"
Andy McFadden [Mon, 19 Jul 2010 18:27:08 +0000 (11:27 -0700)]
Merge "Fix sim-eng build."
Romain Guy [Mon, 19 Jul 2010 17:30:16 +0000 (10:30 -0700)]
Merge "Replaced deprecated calls to setButton and setButton2"
Romain Guy [Mon, 19 Jul 2010 17:29:59 +0000 (10:29 -0700)]
Merge "Replaced deprecated setButton Methodcalls"
Xavier Ducrohet [Mon, 19 Jul 2010 17:25:22 +0000 (10:25 -0700)]
am
0a0bb953: (-s ours) am
80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '
0a0bb953f0198e738e3e15a869af21a66a442466'
* commit '
0a0bb953f0198e738e3e15a869af21a66a442466':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
Eric Laurent [Mon, 19 Jul 2010 17:23:00 +0000 (10:23 -0700)]
am
3c6ea955: am
7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '
3c6ea95553d3a0e416874c583a41efff3f6fbc57'
* commit '
3c6ea95553d3a0e416874c583a41efff3f6fbc57':
Fixed problems in audio effect volume control.
Xavier Ducrohet [Mon, 19 Jul 2010 17:22:59 +0000 (10:22 -0700)]
am
80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge.
Merge commit '
80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp
* commit '
80e62ac61c297452c003919f71c4dcd7063d1b43':
Fix the layoutlib Paint.set(Paint) method. Do not merge.
Eric Laurent [Mon, 19 Jul 2010 17:19:49 +0000 (10:19 -0700)]
am
7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread
Merge commit '
7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp
* commit '
7203272f35e40bf9d4b76f1b2f9b0077738df118':
Fixed problems in audio effect volume control.
Eric Laurent [Mon, 19 Jul 2010 17:13:27 +0000 (10:13 -0700)]
Merge "Fixed problems in audio effect volume control." into gingerbread
The Android Open Source Project [Mon, 19 Jul 2010 16:11:17 +0000 (09:11 -0700)]
am
3d02b48b: merge from open-source master
Merge commit '
3d02b48bd95293c767563729264f007dbcff82b3'
* commit '
3d02b48bd95293c767563729264f007dbcff82b3':
Fix the layoutlib Paint.set(Paint) method.
Adam Bliss [Mon, 19 Jul 2010 16:07:53 +0000 (09:07 -0700)]
am
27ef0f73: am
9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '
27ef0f732c5a97ba88a699b7490045e5370cf51f'
* commit '
27ef0f732c5a97ba88a699b7490045e5370cf51f':
Don't throw an exception from isProviderEnabled and getLastKnownLocation
The Android Open Source Project [Mon, 19 Jul 2010 16:04:02 +0000 (09:04 -0700)]
merge from open-source master
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
Adam Bliss [Mon, 19 Jul 2010 15:36:26 +0000 (08:36 -0700)]
am
9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Merge commit '
9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp
* commit '
9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
Don't throw an exception from isProviderEnabled and getLastKnownLocation
Adam Bliss [Mon, 19 Jul 2010 15:09:19 +0000 (08:09 -0700)]
Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread
Maksymilian Osowski [Mon, 19 Jul 2010 11:09:24 +0000 (04:09 -0700)]
Merge "Added the LayoutTestsRunner class that is responsible for running the tests. Also, added some methods to FileFilter."
James Dong [Sun, 18 Jul 2010 22:08:52 +0000 (15:08 -0700)]
am
5e782937: am
faf775e7: Fix simulator build (1st attempt)
Merge commit '
5e782937ead3042255d83f9c1192f2cc7b688d74'
* commit '
5e782937ead3042255d83f9c1192f2cc7b688d74':
Fix simulator build (1st attempt)
James Dong [Sun, 18 Jul 2010 22:03:15 +0000 (15:03 -0700)]
am
faf775e7: Fix simulator build (1st attempt)
Merge commit '
faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp
* commit '
faf775e772e329e821d81ba735474df097b1e1e9':
Fix simulator build (1st attempt)
Vasu Nori [Sun, 18 Jul 2010 02:25:56 +0000 (19:25 -0700)]
Vasu Nori [Sun, 18 Jul 2010 01:35:21 +0000 (18:35 -0700)]
am
94dab9b1: fix broken api/current.xml
Merge commit '
94dab9b13590b714a7400d513f1e4655c62ddfaf' into gingerbread-plus-aosp
* commit '
94dab9b13590b714a7400d513f1e4655c62ddfaf':
fix broken api/current.xml
Vasu Nori [Sun, 18 Jul 2010 01:31:28 +0000 (18:31 -0700)]
am
bbc2b4e6: am
5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '
bbc2b4e69a1788987a8fe959cc0105290b431283'
* commit '
bbc2b4e69a1788987a8fe959cc0105290b431283':
add video/audio chat-compatibility modes to ContactsContract
Vasu Nori [Sun, 18 Jul 2010 01:25:20 +0000 (18:25 -0700)]
am
5b31498b: add video/audio chat-compatibility modes to ContactsContract
Merge commit '
5b31498ba1f9874f395d80152304512fa4c0144d' into gingerbread-plus-aosp
* commit '
5b31498ba1f9874f395d80152304512fa4c0144d':
add video/audio chat-compatibility modes to ContactsContract
Eric Laurent [Sat, 17 Jul 2010 13:52:16 +0000 (06:52 -0700)]
am
2b381aff: am
2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '
2b381affda94c5b17e023768f9f2271c69152838'
* commit '
2b381affda94c5b17e023768f9f2271c69152838':
First submission of audio effect library from NXP software.
Eric Laurent [Sat, 17 Jul 2010 13:46:03 +0000 (06:46 -0700)]
am
2c87e9c9: First submission of audio effect library from NXP software.
Merge commit '
2c87e9c923b0362fabf8c97ff63997542394c428' into gingerbread-plus-aosp
* commit '
2c87e9c923b0362fabf8c97ff63997542394c428':
First submission of audio effect library from NXP software.
Romain Guy [Sat, 17 Jul 2010 06:19:19 +0000 (23:19 -0700)]
Merge "Add program for linear gradient."
Robert Greenwalt [Sat, 17 Jul 2010 01:38:57 +0000 (18:38 -0700)]
Merge "Fix emulator dns."
Jeff Brown [Sat, 17 Jul 2010 00:56:15 +0000 (17:56 -0700)]
am
3994396b: am
d3616592: Fix trackball down and movement bugs.
Merge commit '
3994396b089c36f432a7af5d542ef594142dd09b'
* commit '
3994396b089c36f432a7af5d542ef594142dd09b':
Fix trackball down and movement bugs.
Jeff Brown [Sat, 17 Jul 2010 00:53:48 +0000 (17:53 -0700)]
am
d3616592: Fix trackball down and movement bugs.
Merge commit '
d3616592fe1b315b589766c4b74ce728fc4968f5' into gingerbread-plus-aosp
* commit '
d3616592fe1b315b589766c4b74ce728fc4968f5':
Fix trackball down and movement bugs.
Jeff Brown [Sat, 17 Jul 2010 00:21:06 +0000 (17:21 -0700)]
Fix trackball down and movement bugs.
Bug:
2823788
Change-Id: Icb0c392b58f7e735614460b5eb87439cb73ac4f2
Chet Haase [Sat, 17 Jul 2010 00:39:44 +0000 (17:39 -0700)]
Merge "Fixing view property invalidation issues"
Romain Guy [Sat, 17 Jul 2010 00:13:26 +0000 (17:13 -0700)]
Merge "Add plumbing to support gradients in OpenGL renderer."
Jeff Brown [Fri, 16 Jul 2010 23:25:45 +0000 (16:25 -0700)]
am
e2fb11b9: am
ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit '
e2fb11b9b02518126ace1a998ae7f824fc76068a'
* commit '
e2fb11b9b02518126ace1a998ae7f824fc76068a':
Ignore attempts to finish events on unregistered channels.
Hung Dang [Fri, 16 Jul 2010 23:25:27 +0000 (16:25 -0700)]
am
d652751d: am
b6761e73: am
28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit '
d652751de782bac7e37916ed5786fcfa637a2be3'
* commit '
d652751de782bac7e37916ed5786fcfa637a2be3':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Jamie Gennis [Fri, 16 Jul 2010 23:25:23 +0000 (16:25 -0700)]
am
04b95313: am
c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit '
04b953132edb5482f0aa6d992f89e7016961528c'
* commit '
04b953132edb5482f0aa6d992f89e7016961528c':
Re-use existing Surface objects when reading them from parcels.
Jeff Brown [Fri, 16 Jul 2010 23:25:13 +0000 (16:25 -0700)]
am
7b8df313: am
00ba8844: Fix individual pointer id up/down reporting.
Merge commit '
7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d'
* commit '
7b8df313f714d6e8d536e0f8bbe5496fe9a6c26d':
Fix individual pointer id up/down reporting.
Scott Main [Fri, 16 Jul 2010 23:25:03 +0000 (16:25 -0700)]
am
aba4bf19: am
e068b464: am
2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '
aba4bf19fbdedb2f4f438895e8165a3b34a15633'
* commit '
aba4bf19fbdedb2f4f438895e8165a3b34a15633':
docs: editorial revisions to Search guide
Jeff Brown [Fri, 16 Jul 2010 23:03:07 +0000 (16:03 -0700)]
am
ace999b0: Ignore attempts to finish events on unregistered channels.
Merge commit '
ace999b096739d376d4845c0ba94599197ff8477' into gingerbread-plus-aosp
* commit '
ace999b096739d376d4845c0ba94599197ff8477':
Ignore attempts to finish events on unregistered channels.
Jean-Baptiste Queru [Fri, 16 Jul 2010 22:25:26 +0000 (15:25 -0700)]
Merge "Fix build."
Hung Dang [Fri, 16 Jul 2010 22:18:03 +0000 (15:18 -0700)]
am
b6761e73: am
28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit '
b6761e73ce6b255cfe96bfa1fa6ac611abcfc067' into gingerbread-plus-aosp
* commit '
b6761e73ce6b255cfe96bfa1fa6ac611abcfc067':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Jamie Gennis [Fri, 16 Jul 2010 22:17:59 +0000 (15:17 -0700)]
am
c8c79a65: Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Merge commit '
c8c79a654d4ae8e3a883854e19cc2df757f72d82' into gingerbread-plus-aosp
* commit '
c8c79a654d4ae8e3a883854e19cc2df757f72d82':
Re-use existing Surface objects when reading them from parcels.
Hung Dang [Fri, 16 Jul 2010 22:15:44 +0000 (15:15 -0700)]
am
28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Merge commit '
28fe43be5c364a8f7f248a5ac05cf832a83737c2' into gingerbread
* commit '
28fe43be5c364a8f7f248a5ac05cf832a83737c2':
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Jamie Gennis [Fri, 16 Jul 2010 22:14:44 +0000 (15:14 -0700)]
Merge "Re-use existing Surface objects when reading them from parcels." into gingerbread
Jeff Brown [Fri, 16 Jul 2010 22:14:35 +0000 (15:14 -0700)]
am
00ba8844: Fix individual pointer id up/down reporting.
Merge commit '
00ba884436dc8b222ad850c73c936d87bf4e84de' into gingerbread-plus-aosp
* commit '
00ba884436dc8b222ad850c73c936d87bf4e84de':
Fix individual pointer id up/down reporting.
Hung Dang [Fri, 16 Jul 2010 22:13:12 +0000 (15:13 -0700)]
Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Jeff Brown [Fri, 16 Jul 2010 22:01:56 +0000 (15:01 -0700)]
Fix individual pointer id up/down reporting.
Fix a minor threading bug in InputManager dump.
Change-Id: Ic2eecf7df5a8dc9f40561fcb03ebe58a2c073778
Romain Guy [Fri, 16 Jul 2010 22:09:07 +0000 (15:09 -0700)]
Merge "Optimize textures binding."
Scott Main [Fri, 16 Jul 2010 22:02:30 +0000 (15:02 -0700)]
am
e068b464: am
2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '
e068b46408f3ff390b47dc78ccf10fab76883051' into gingerbread-plus-aosp
* commit '
e068b46408f3ff390b47dc78ccf10fab76883051':
docs: editorial revisions to Search guide
Scott Main [Fri, 16 Jul 2010 21:59:48 +0000 (14:59 -0700)]
am
2a8dd4e4: Merge "docs: editorial revisions to Search guide" into froyo
Merge commit '
2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1' into gingerbread
* commit '
2a8dd4e46f43c2bc5b3c1cfd2f350a83ea2b18b1':
docs: editorial revisions to Search guide
OSDN Git Service
