OSDN Git Service
Dan Morrill [Thu, 17 Jun 2010 19:23:03 +0000 (12:23 -0700)]
am
6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission.
Merge commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09' into froyo-plus-aosp
* commit '
6b22d81aa35d9a9b32670995c002e92588b2fe09':
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
Scott Main [Wed, 16 Jun 2010 02:43:19 +0000 (19:43 -0700)]
am
cdeae439: Merge "docs: update dashboard" into froyo
Merge commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8' into froyo-plus-aosp
* commit '
cdeae439a3637062dc0701654a1cb7874bfd1ae8':
docs: update dashboard
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Ying Wang [Tue, 15 Jun 2010 22:32:36 +0000 (15:32 -0700)]
am
6567adf8: Move android-common to framework/ex
Merge commit '
6567adf8b637c36817625cd38d64cd4b8510b097' into froyo-plus-aosp
* commit '
6567adf8b637c36817625cd38d64cd4b8510b097':
Move android-common to framework/ex
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Joe Onorato [Tue, 15 Jun 2010 21:24:58 +0000 (14:24 -0700)]
am
27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo
Merge commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7' into froyo-plus-aosp
* commit '
27357fc08802d796a6b6a1111ac5534d75fc8be7':
Use the droidcore goal with dist-for-goals.
Joe Onorato [Tue, 15 Jun 2010 21:24:51 +0000 (14:24 -0700)]
am
9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo
Merge commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into froyo-plus-aosp
* commit '
9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
The Android Open Source Project [Tue, 15 Jun 2010 18:44:09 +0000 (11:44 -0700)]
merge from open-source master
Change-Id: Ib9ec3f3b7418d064b643577156d7d16688b3048d
The Android Open Source Project [Tue, 15 Jun 2010 18:37:17 +0000 (11:37 -0700)]
merge from open-source master
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
The Android Open Source Project [Tue, 15 Jun 2010 18:34:57 +0000 (11:34 -0700)]
merge from open-source master
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
Scott Main [Tue, 15 Jun 2010 17:45:55 +0000 (10:45 -0700)]
am
457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Merge commit '
457738e628ee4d165014996bcf4e8d1983ac5929' into froyo-plus-aosp
* commit '
457738e628ee4d165014996bcf4e8d1983ac5929':
docs: add information about known issues in resource matching
Scott Main [Tue, 15 Jun 2010 17:45:50 +0000 (10:45 -0700)]
am
322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '
322e7e477d89aca18d65cbd289343e716c45a699' into froyo-plus-aosp
* commit '
322e7e477d89aca18d65cbd289343e716c45a699':
docs: fix markup error
Jean-Baptiste Queru [Tue, 15 Jun 2010 17:40:51 +0000 (10:40 -0700)]
Merge "Fix that InputDeviceReaderThread that got killed during startup"
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
The Android Open Source Project [Tue, 15 Jun 2010 16:32:37 +0000 (09:32 -0700)]
merge from open-source master
Change-Id: I4d7b0ec9895d8b090e0cdf2efb6731358a5d087c
The Android Open Source Project [Tue, 15 Jun 2010 16:30:31 +0000 (09:30 -0700)]
merge from open-source master
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c
The Android Open Source Project [Tue, 15 Jun 2010 16:27:48 +0000 (09:27 -0700)]
merge from open-source master
Change-Id: I227bf1b5f1de8f858df72d58a4463aed5cc09cbc
Jean-Baptiste Queru [Tue, 15 Jun 2010 14:49:05 +0000 (07:49 -0700)]
Merge "Use stride for source and target buffers when copybit is enabled."
Jean-Baptiste Queru [Mon, 14 Jun 2010 23:23:58 +0000 (16:23 -0700)]
Merge "Replaced deprecated String Constructor"
The Android Open Source Project [Mon, 14 Jun 2010 21:28:18 +0000 (14:28 -0700)]
merge from open-source master
Change-Id: I381f1faaa26a7e52e9882976f32f703fc2aa9c75
The Android Open Source Project [Mon, 14 Jun 2010 21:18:32 +0000 (14:18 -0700)]
merge from open-source master
Change-Id: Ia8a5ab84bb9957b4a3daf92a9a21905212867a95
Jean-Baptiste Queru [Mon, 14 Jun 2010 20:54:25 +0000 (13:54 -0700)]
Merge "Fix data type of RIL_UNSOL_RESPONSE_NEW_BROADCAST_SMS in RIL."
Jean-Baptiste Queru [Mon, 14 Jun 2010 19:47:49 +0000 (12:47 -0700)]
Merge "Corrected SPN and PLMN name handling"
The Android Open Source Project [Mon, 14 Jun 2010 18:07:32 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
The Android Open Source Project [Mon, 14 Jun 2010 18:06:33 +0000 (11:06 -0700)]
merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
The Android Open Source Project [Mon, 14 Jun 2010 18:02:30 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: Ic1ad1c55b5f4560b51c6b422b6f086c95a6fd69e
The Android Open Source Project [Mon, 14 Jun 2010 17:57:53 +0000 (10:57 -0700)]
merge from open-source master
Change-Id: I5d19eb677dcfc7b73919d659fafb29fb85dc7f47
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:28:23 +0000 (10:28 -0700)]
Merge "replaced deprecated getIntent with parseURI"
Jean-Baptiste Queru [Mon, 14 Jun 2010 16:27:14 +0000 (09:27 -0700)]
Merge "Added an addAll to the ArrayAdapter"
Jean-Baptiste Queru [Mon, 14 Jun 2010 15:56:49 +0000 (08:56 -0700)]
Merge "Should accept "application/vnd.wap.multipart.alternative" message."
Dirk Dougherty [Fri, 11 Jun 2010 23:57:45 +0000 (16:57 -0700)]
am
1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b' into froyo-plus-aosp
* commit '
1067e6895e941f56edc7bc3d7c16a7122fb5259b':
Doc change: remove pdf summary of guidelines from templates archive.
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Irfan Sheriff [Fri, 11 Jun 2010 22:11:54 +0000 (15:11 -0700)]
merge from open-source master
Change-Id: I8a950276787e9439420db396d0e32f88bd6e04cc
The Android Open Source Project [Fri, 11 Jun 2010 20:08:02 +0000 (13:08 -0700)]
merge from open-source master
Change-Id: Ia668b322a02e220b74c222dbbcc5b4fdc3c59ab0
Jean-Baptiste Queru [Fri, 11 Jun 2010 18:12:15 +0000 (11:12 -0700)]
Merge "WLAN: Reset power save mode to startup value after DHCP response."
Irfan Sheriff [Fri, 11 Jun 2010 02:02:13 +0000 (19:02 -0700)]
am
9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b' into froyo-plus-aosp
* commit '
9f2a0115220c8e288c32d8cf90e235a2f2be115b':
Remove indefinite DHCP retries
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Joe Onorato [Thu, 10 Jun 2010 02:06:02 +0000 (19:06 -0700)]
Use the droidcore goal with dist-for-goals.
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
Mike Lockwood [Thu, 10 Jun 2010 22:30:33 +0000 (15:30 -0700)]
am
f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp
* commit '
f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
Don't adjust lights if screen or button brightness is changed when the screen is off.
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Adam Powell [Thu, 10 Jun 2010 21:14:44 +0000 (14:14 -0700)]
am
8f2ca788: Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '
8f2ca788f369892370477212cf9e7a67721a8c16' into froyo-plus-aosp
* commit '
8f2ca788f369892370477212cf9e7a67721a8c16':
Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down.
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Nick Kralevich [Thu, 10 Jun 2010 18:50:51 +0000 (11:50 -0700)]
Kenny Root [Thu, 10 Jun 2010 05:32:01 +0000 (22:32 -0700)]
am
b00854d4: Import revised translations
Merge commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e' into froyo-plus-aosp
* commit '
b00854d4c07ee8c810d1e32984543297bfa80a8e':
Import revised translations
The Android Open Source Project [Wed, 9 Jun 2010 19:17:03 +0000 (12:17 -0700)]
merge from open-source master
Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
The Android Open Source Project [Wed, 9 Jun 2010 19:14:58 +0000 (12:14 -0700)]
merge from open-source master
Change-Id: Iaf90d2aaa3cb3a435336c2ccd08b587d9fc3690b
Jean-Baptiste Queru [Wed, 9 Jun 2010 17:51:16 +0000 (10:51 -0700)]
Merge "Adding mimetypes to the mimetype map used in the web view"
The Android Open Source Project [Wed, 9 Jun 2010 16:21:39 +0000 (09:21 -0700)]
ignore from open-source master
Change-Id: I534482f2c6ef252d704809fb0ce2f38f9f3d0cef
Jean-Baptiste Queru [Wed, 9 Jun 2010 14:28:50 +0000 (07:28 -0700)]
Merge "Fix for deadlock between StatusBarService and NotificationManagerService"
The Android Open Source Project [Wed, 9 Jun 2010 14:14:36 +0000 (07:14 -0700)]
merge from open-source master
Change-Id: I1fd774738c01a2cdffac0d455c63d574131e6fb8
Jim Miller [Tue, 8 Jun 2010 23:33:22 +0000 (16:33 -0700)]
am
75b6a6b9: Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Merge commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c' into froyo-plus-aosp
* commit '
75b6a6b972e6b18143fd629d3d9c824c442c5f4c':
Fix
2737842: Disable KeguardManager API if device policy is enabled
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Jean-Baptiste Queru [Tue, 8 Jun 2010 22:43:02 +0000 (15:43 -0700)]
Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend"
The Android Open Source Project [Tue, 8 Jun 2010 20:17:41 +0000 (13:17 -0700)]
merge from open-source master
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
Romain Guy [Tue, 8 Jun 2010 20:01:05 +0000 (13:01 -0700)]
am
71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp
* commit '
71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
Add a method to hide/show a SurfaceView's surface.
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Jean-Baptiste Queru [Tue, 8 Jun 2010 17:19:51 +0000 (10:19 -0700)]
Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https."
Jim Miller [Tue, 8 Jun 2010 04:23:33 +0000 (21:23 -0700)]
Jim Miller [Tue, 8 Jun 2010 02:26:28 +0000 (19:26 -0700)]
am
bde25c20: Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Merge commit '
bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp
* commit '
bde25c207731783a62e3611586fe05cd35add0d9':
Fix
2737842: disable keyguard API when device policy is enabled.
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo
Christopher Tate [Tue, 8 Jun 2010 01:49:07 +0000 (18:49 -0700)]
am
ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo
Merge commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into froyo-plus-aosp
* commit '
ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
Don't bring up Launcher until after boot complete
Christopher Tate [Tue, 8 Jun 2010 01:46:46 +0000 (18:46 -0700)]
Merge "Don't bring up Launcher until after boot complete" into froyo
Dianne Hackborn [Tue, 8 Jun 2010 01:32:41 +0000 (18:32 -0700)]
am
d1d9047d: Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Merge commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into froyo-plus-aosp
* commit '
d1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
Fix issue #
2749322: addPackageToPreferred throws SecurityException
Dianne Hackborn [Tue, 8 Jun 2010 00:32:02 +0000 (17:32 -0700)]
Merge "Fix issue #
2749322: addPackageToPreferred throws SecurityException" into froyo
Robert Greenwalt [Mon, 7 Jun 2010 23:59:23 +0000 (16:59 -0700)]
am
5a671d03: Cut logging, boost efficiency of ThrottleService
Merge commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed' into froyo-plus-aosp
* commit '
5a671d03e3abe522a761a43b0460f9f3816b14ed':
Cut logging, boost efficiency of ThrottleService
The Android Open Source Project [Mon, 7 Jun 2010 23:37:22 +0000 (16:37 -0700)]
merge from open-source master
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
The Android Open Source Project [Mon, 7 Jun 2010 23:32:53 +0000 (16:32 -0700)]
merge from open-source master
Change-Id: I56de40bad4be52a06300bfc310e16d27b2fb14df
Jean-Baptiste Queru [Mon, 7 Jun 2010 21:51:42 +0000 (14:51 -0700)]
Merge "Canvas.drawVertices: correct color range-check"
Christopher Tate [Sat, 5 Jun 2010 01:07:07 +0000 (18:07 -0700)]
am
df2e2eff: Merge "Watchdog now records kernel stacks when it fires" into froyo
Merge commit '
df2e2eff9446c0220515fa7aab7857135e04e12e' into froyo-plus-aosp
* commit '
df2e2eff9446c0220515fa7aab7857135e04e12e':
Watchdog now records kernel stacks when it fires
Christopher Tate [Sat, 5 Jun 2010 01:06:07 +0000 (18:06 -0700)]
Merge "Watchdog now records kernel stacks when it fires" into froyo
Dianne Hackborn [Fri, 4 Jun 2010 23:33:48 +0000 (16:33 -0700)]
Dianne Hackborn [Fri, 4 Jun 2010 23:32:01 +0000 (16:32 -0700)]
Merge "xhdpi" into froyo
Robert Greenwalt [Fri, 4 Jun 2010 22:57:21 +0000 (15:57 -0700)]
am
f9610b38: Merge "Make the DUN apn data secure." into froyo
Merge commit '
f9610b3842e030138c1dc327a3a467aaea02c227' into froyo-plus-aosp
* commit '
f9610b3842e030138c1dc327a3a467aaea02c227':
Make the DUN apn data secure.
Robert Greenwalt [Fri, 4 Jun 2010 22:55:09 +0000 (15:55 -0700)]
Merge "Make the DUN apn data secure." into froyo
Jeff Hamilton [Fri, 4 Jun 2010 20:50:31 +0000 (13:50 -0700)]
am
4b330921: Don\'t crash when low storage is encountered pre-boot completion.
Merge commit '
4b3309211ed6f3532b44481945a4725143d50b8a' into froyo-plus-aosp
* commit '
4b3309211ed6f3532b44481945a4725143d50b8a':
Don't crash when low storage is encountered pre-boot completion.
The Android Open Source Project [Fri, 4 Jun 2010 18:07:49 +0000 (11:07 -0700)]
merge from open-source master
Change-Id: Ic9060d92c014d6cbe9d90ce8deca8fa111711471
Andreas Huber [Thu, 3 Jun 2010 22:30:03 +0000 (15:30 -0700)]
am
2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Merge commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491' into froyo-plus-aosp
* commit '
2e3761ba43f634e97ac493f4b79e5e53954a1491':
Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle.
Andreas Huber [Thu, 3 Jun 2010 22:28:13 +0000 (15:28 -0700)]
Merge "Changes to the prefetcher to allow for bursts of data to be transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
Romain Guy [Thu, 3 Jun 2010 21:26:21 +0000 (14:26 -0700)]
Merge "Add better error handling for savePicture and restorePicture"
Dirk Dougherty [Thu, 3 Jun 2010 19:58:35 +0000 (12:58 -0700)]
am
85a1c578: Merge "Doc change: Adjust security sandbox description." into froyo
Merge commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e' into froyo-plus-aosp
* commit '
85a1c578300a0c9fb23aef5f79c9b1f3892e9c2e':
Doc change: Adjust security sandbox description.
Dirk Dougherty [Thu, 3 Jun 2010 19:57:06 +0000 (12:57 -0700)]
Merge "Doc change: Adjust security sandbox description." into froyo
James Dong [Thu, 3 Jun 2010 18:27:19 +0000 (11:27 -0700)]
am
28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '
28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '
28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
James Dong [Thu, 3 Jun 2010 18:26:09 +0000 (11:26 -0700)]
Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
The Android Open Source Project [Thu, 3 Jun 2010 16:03:58 +0000 (09:03 -0700)]
merge from open-source master
Change-Id: Idf8d5661d7b261b74ac0b1271af98795ac5faff9
Scott Main [Wed, 2 Jun 2010 20:44:44 +0000 (13:44 -0700)]
am
6a297118: Merge "docs: a couple doc bug fixes" into froyo
Merge commit '
6a297118724f31b1063b74f52295d459ec4f58dc' into froyo-plus-aosp
* commit '
6a297118724f31b1063b74f52295d459ec4f58dc':
docs: a couple doc bug fixes
Scott Main [Wed, 2 Jun 2010 20:43:18 +0000 (13:43 -0700)]
Merge "docs: a couple doc bug fixes" into froyo
The Android Open Source Project [Wed, 2 Jun 2010 15:54:47 +0000 (08:54 -0700)]
merge from open-source master
Change-Id: I8333e295ba6b6ed8e7658ecf3fbf1ebea3537aeb
The Android Open Source Project [Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)]
merge from open-source master
Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6
Mathias Palmqvist [Wed, 2 Jun 2010 14:03:04 +0000 (16:03 +0200)]
Use stride for source and target buffers when copybit is enabled.
Change-Id: Ie651013b3522f8e004685d74190da86433086307
Kenny Root [Wed, 2 Jun 2010 05:56:39 +0000 (22:56 -0700)]
Merge "Improved error-handling in Rfc822Tokenizer"
Dirk Dougherty [Tue, 1 Jun 2010 22:45:24 +0000 (15:45 -0700)]
am
de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '
de56c27dab020bf85187c8bcfc6842cb31006c59' into froyo-plus-aosp
* commit '
de56c27dab020bf85187c8bcfc6842cb31006c59':
Doc change: rename slide decks for sorting by year then quarter.
Dirk Dougherty [Tue, 1 Jun 2010 22:44:02 +0000 (15:44 -0700)]
Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Dan Egnor [Tue, 1 Jun 2010 21:28:46 +0000 (14:28 -0700)]
am
a80331c4: Merge "Comment-only change to add documentation for FileObserver" into froyo
Merge commit '
a80331c4d75cb8a7122e31315bc1e2950131659c' into froyo-plus-aosp
* commit '
a80331c4d75cb8a7122e31315bc1e2950131659c':
Comment-only change to add documentation for FileObserver
Dan Egnor [Tue, 1 Jun 2010 21:09:20 +0000 (14:09 -0700)]
Merge "Comment-only change to add documentation for FileObserver" into froyo
Dirk Dougherty [Tue, 1 Jun 2010 18:07:56 +0000 (11:07 -0700)]
am
862ad0e5: Merge "Doc change: updated dashboards stats." into froyo
Merge commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c' into froyo-plus-aosp
* commit '
862ad0e5242ae6ec43e8570c52e81b0953e6e76c':
Doc change: updated dashboards stats.
Dirk Dougherty [Tue, 1 Jun 2010 18:04:20 +0000 (11:04 -0700)]
Merge "Doc change: updated dashboards stats." into froyo
Christopher Tate [Fri, 28 May 2010 19:50:05 +0000 (12:50 -0700)]
am
6ee412d5: Also dump system process threads halfway through the watchdog interval
Merge commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd' into froyo-plus-aosp
* commit '
6ee412d51d8b601580cfb4b7be4f676b7ec76afd':
Also dump system process threads halfway through the watchdog interval
OSDN Git Service
