OSDN Git Service
Wei-Ta Chen [Thu, 13 Jan 2011 20:06:38 +0000 (12:06 -0800)]
am
61d9ffbf: Merge "Do not merge." into gingerbread
* commit '
61d9ffbfd86dfe6bacce431b8ed9eebe1cfd8178':
Do not merge.
Wei-Ta Chen [Thu, 13 Jan 2011 20:02:32 +0000 (12:02 -0800)]
Merge "Do not merge." into gingerbread
Gloria Wang [Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)]
am
a220a297: Merge "Initial OMA DRM forward lock contribution"
* commit '
a220a2979937700024662be0f8fc166ca65506ed':
Initial OMA DRM forward lock contribution
Gloria Wang [Thu, 13 Jan 2011 18:51:13 +0000 (10:51 -0800)]
Merge "Initial OMA DRM forward lock contribution"
Dan Morrill [Thu, 13 Jan 2011 18:19:29 +0000 (10:19 -0800)]
am
4330b146: Adding ASL2 attribution for VisualOn.
* commit '
4330b1464d26fa693b61d496092e10ce0419ee3d':
Adding ASL2 attribution for VisualOn.
Dan Morrill [Thu, 13 Jan 2011 17:24:01 +0000 (09:24 -0800)]
Adding ASL2 attribution for VisualOn.
Change-Id: I870133fc366507d95741f8aa234776de58ba60a9
Nick Pelly [Thu, 13 Jan 2011 00:33:48 +0000 (16:33 -0800)]
am
a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '
a29bf14e1d2857debc632ce4304a1c72dded348c':
New Intent defined for RF ON/OFF events
Nick Pelly [Thu, 13 Jan 2011 00:28:59 +0000 (16:28 -0800)]
Merge "New Intent defined for RF ON/OFF events" into gingerbread
Brad Fitzpatrick [Wed, 12 Jan 2011 23:59:44 +0000 (15:59 -0800)]
am
bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '
bdb7aee0a4934eb138f7caaf921f6c86f350b4b7':
Fix for crash when setting live wallpaper.
Brad Fitzpatrick [Wed, 12 Jan 2011 23:45:05 +0000 (15:45 -0800)]
Merge "Fix for crash when setting live wallpaper."
Kenny Root [Wed, 12 Jan 2011 23:06:51 +0000 (15:06 -0800)]
am
e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '
e8c04db71e347396e9537ead7113ba9f46706e44':
Add the {get,set}PackageObbPaths calls to API
Kenny Root [Wed, 12 Jan 2011 23:03:43 +0000 (15:03 -0800)]
Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
Jaikumar Ganesh [Wed, 12 Jan 2011 21:58:17 +0000 (13:58 -0800)]
am
c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit '
c8f42fb69867f171c04013b1b1a8f7e897ae3685':
DO NOT MERGE: Remove auto connection on ACL connection.
Jaikumar Ganesh [Wed, 12 Jan 2011 21:56:13 +0000 (13:56 -0800)]
Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
Eric Laurent [Wed, 12 Jan 2011 21:52:42 +0000 (13:52 -0800)]
am
bec4abaa: Merge "Fix issue
3302649." into gingerbread
* commit '
bec4abaa12bf6759f354b54119c5524cf9339e7b':
Fix issue
3302649.
Eric Laurent [Wed, 12 Jan 2011 21:50:51 +0000 (13:50 -0800)]
Merge "Fix issue
3302649." into gingerbread
Justin Ho [Wed, 12 Jan 2011 21:50:25 +0000 (13:50 -0800)]
am
7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '
7b667a0c4b017af3c6b9e1f8a6dae56e2c53e07f':
Updated flightmode assets
Justin Ho [Wed, 12 Jan 2011 21:47:59 +0000 (13:47 -0800)]
Merge "Updated flightmode assets" into gingerbread
Kenny Root [Wed, 12 Jan 2011 19:59:49 +0000 (11:59 -0800)]
am
6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '
6688b6c31765242866fc276cea7fa241fc5b5e7b':
Allow updated system apps to retain priority
Kenny Root [Wed, 12 Jan 2011 19:56:25 +0000 (11:56 -0800)]
Merge "Allow updated system apps to retain priority" into gingerbread
Andreas Huber [Wed, 12 Jan 2011 18:35:18 +0000 (10:35 -0800)]
am
7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit '
7c6153606cc963191362494c8cb5669749e84326':
Fail to parse duration instead of asserting, if the server response cannot be parsed.
Andreas Huber [Wed, 12 Jan 2011 00:22:33 +0000 (16:22 -0800)]
am
7e2f9cc8: DO NOT MERGE: Fix Matroska issues
* commit '
7e2f9cc81da788006790365ff11f06551fc1bc26':
DO NOT MERGE: Fix Matroska issues
repo sync [Tue, 11 Jan 2011 23:26:51 +0000 (15:26 -0800)]
resolved conflicts for merge of
e7fbfb6b to gingerbread-plus-aosp
Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26
Andreas Huber [Tue, 11 Jan 2011 21:52:12 +0000 (13:52 -0800)]
Merge "DO NOT MERGE: Fix parsing of ntp= PLAY response." into gingerbread
Kenny Root [Tue, 11 Jan 2011 20:27:42 +0000 (12:27 -0800)]
am
91c459ec: Copy user info from PackageSetting as well
* commit '
91c459ec7dba6d56816ff5cbd92c627e0f718915':
Copy user info from PackageSetting as well
Chung-yih Wang [Tue, 11 Jan 2011 10:15:29 +0000 (02:15 -0800)]
am
65ba2c42: Merge "Add auth. username in SipProfile." into gingerbread
* commit '
65ba2c421c19fde04e6b294087a5a9c507964575':
Add auth. username in SipProfile.
Chung-yih Wang [Tue, 11 Jan 2011 10:08:19 +0000 (02:08 -0800)]
Merge "Add auth. username in SipProfile." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 22:19:30 +0000 (14:19 -0800)]
am
ca36d863: Update API current.xml to unbreak build.
* commit '
ca36d863cc1684807e93f442c5ace89f08b9b5f5':
Update API current.xml to unbreak build.
Martijn Coenen [Mon, 10 Jan 2011 20:14:36 +0000 (12:14 -0800)]
am
25be5365: Implement canMakeReadonly().
* commit '
25be53652167300183282d170a00a6df576523f5':
Implement canMakeReadonly().
James Dong [Mon, 10 Jan 2011 20:09:09 +0000 (12:09 -0800)]
am
13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
* commit '
13d1cb56dfdfc89888de6a0389b0fe6cf7e36c27':
Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge
Nick Pelly [Mon, 10 Jan 2011 20:06:51 +0000 (12:06 -0800)]
am
92939376: Merge "Remove attemptDeadServiceRecovery() from TagTechnology\'s." into gingerbread
* commit '
92939376199a08fa0a3b01759579a4979c2a94a2':
Remove attemptDeadServiceRecovery() from TagTechnology's.
Nick Pelly [Mon, 10 Jan 2011 20:06:39 +0000 (12:06 -0800)]
am
d64d711d: Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
* commit '
d64d711d457326b503981f7e55ab1448fa23ad9f':
Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)
James Dong [Mon, 10 Jan 2011 20:04:50 +0000 (12:04 -0800)]
Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge" into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:36 +0000 (12:02 -0800)]
Merge "Remove attemptDeadServiceRecovery() from TagTechnology's." into gingerbread
Nick Pelly [Mon, 10 Jan 2011 20:02:26 +0000 (12:02 -0800)]
Merge "Change Tag.getTechnology(NfcAdapter, int) to NfcAdapter.getTechnology(Tag, int)" into gingerbread
Brad Fitzpatrick [Mon, 10 Jan 2011 16:32:35 +0000 (08:32 -0800)]
am
cb842753: Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
* commit '
cb8427538dfdc5eae941e377b11bfd11a95fc5a5':
Closing cursor in finalizer to avoid GREF and fd leak in acore
Brad Fitzpatrick [Mon, 10 Jan 2011 16:02:03 +0000 (08:02 -0800)]
Merge "Closing cursor in finalizer to avoid GREF and fd leak in acore"
Dianne Hackborn [Sun, 9 Jan 2011 21:56:07 +0000 (13:56 -0800)]
am
9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '
9aac2e2b9541c424ca02483631b08949f0e90c8c':
Referencing of "r.record.name" is occured, when "r.record" is null.
Dianne Hackborn [Sun, 9 Jan 2011 21:53:53 +0000 (13:53 -0800)]
Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
Chris Tate [Sun, 9 Jan 2011 21:31:23 +0000 (13:31 -0800)]
am
bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit '
bbff7ed44b353ff299b900a1ff50812a082206f0':
DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Chris Tate [Sun, 9 Jan 2011 21:04:01 +0000 (13:04 -0800)]
am
6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '
6ec91731cbf6ee1a9a914d341fab9567d1599018':
DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
Dianne Hackborn [Sun, 9 Jan 2011 19:49:59 +0000 (11:49 -0800)]
am
433863b1: Fix issue #
3333958: Package Manager can sometimes mistakenly think...
* commit '
433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
Fix issue #
3333958: Package Manager can sometimes mistakenly think...
Dianne Hackborn [Sun, 9 Jan 2011 19:44:17 +0000 (11:44 -0800)]
am
cd23823d: Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit '
cd23823d4f533431c76baa104eb50b7803b3b391':
Fix issue #
3227963: SecurityException: Neither user 10023 nor...
Dianne Hackborn [Sun, 9 Jan 2011 19:38:15 +0000 (11:38 -0800)]
Merge "Fix issue #
3227963: SecurityException: Neither user 10023 nor..." into gingerbread
Romain Guy [Sat, 8 Jan 2011 18:18:10 +0000 (10:18 -0800)]
am
fcf3d12d: Merge "Typo in Javadoc"
* commit '
fcf3d12d701e41d6e46bae8c13776f56d54f90e8':
Typo in Javadoc
Romain Guy [Sat, 8 Jan 2011 18:04:32 +0000 (10:04 -0800)]
Merge "Typo in Javadoc"
Gloria Wang [Fri, 7 Jan 2011 23:34:08 +0000 (15:34 -0800)]
am
0544d059: Merge "DRM Framework bug fixes."
* commit '
0544d05990c0f43a143e98e71f7fc60277872806':
DRM Framework bug fixes.
Scott Main [Fri, 7 Jan 2011 23:32:04 +0000 (15:32 -0800)]
am
9b447d12: docs: catchup gingerbread to gingerbread-docs with misc changes
* commit '
9b447d122a2f0a4798f03749e9d93b9a58834fe3':
docs: catchup gingerbread to gingerbread-docs with misc changes
Scott Main [Fri, 7 Jan 2011 21:36:58 +0000 (13:36 -0800)]
am
3d0f0108: cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
* commit '
3d0f0108f9487512195c7344be2417c30a93c3fc':
cherry pick Change-Id: Ic4fe5e2d1ef3082c34fb448dd1f4705f73f2235f docs: update dashboard
Scott Main [Fri, 7 Jan 2011 21:34:54 +0000 (13:34 -0800)]
Gloria Wang [Fri, 7 Jan 2011 19:10:49 +0000 (11:10 -0800)]
Merge "DRM Framework bug fixes."
Yu Shan Emily Lau [Fri, 7 Jan 2011 17:40:18 +0000 (09:40 -0800)]
am
2af4e71d: Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
* commit '
2af4e71dd47565d794ad48041a156871396a7dde':
Fix the test application orientation. Bug#
3205196
Yu Shan Emily Lau [Fri, 7 Jan 2011 17:38:24 +0000 (09:38 -0800)]
Merge "Fix the test application orientation. Bug#
3205196" into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 17:23:11 +0000 (09:23 -0800)]
am
9ffb0a0d: Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
* commit '
9ffb0a0df3a97115234bd50a73ca60efcefb4ef7':
Ran fixPngMetaTags on all the core/res assets.
Gilles Debunne [Fri, 7 Jan 2011 17:23:07 +0000 (09:23 -0800)]
am
97664784: Merge "Asset cleanup. DO NOT MERGE" into gingerbread
* commit '
976647841cc9e52c373679c930d06d81310ff289':
Asset cleanup. DO NOT MERGE
Marco Nelissen [Fri, 7 Jan 2011 17:22:57 +0000 (09:22 -0800)]
am
f13d4501: Send "compilation" tag when inserting into the database. It\'s not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
* commit '
f13d4501396aa1679004ad07d440f65ced3ecc2b':
Send "compilation" tag when inserting into the database. It's not actually inserted into the database, but the media provider uses it for disambiguating albums. b/
3311831
Dianne Hackborn [Fri, 7 Jan 2011 08:58:04 +0000 (00:58 -0800)]
am
3c902a62: Merge "Avoiding cyclic references when unbinding from a service"
* commit '
3c902a62eddebc75adb5286e55e1107e0b63551f':
Avoiding cyclic references when unbinding from a service
Dianne Hackborn [Fri, 7 Jan 2011 08:43:15 +0000 (00:43 -0800)]
Merge "Avoiding cyclic references when unbinding from a service"
Marco Nelissen [Fri, 7 Jan 2011 04:29:11 +0000 (20:29 -0800)]
am
ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
* commit '
ba77a3f9cb1d68b2ed4813aaae856444578e3a75':
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/
3311831
Nick Pelly [Fri, 7 Jan 2011 04:29:06 +0000 (20:29 -0800)]
am
f54ad8da: Clean up transceive().
* commit '
f54ad8daf6f9dc2b9670ab1abbbfa4308b40bc6a':
Clean up transceive().
Eric Fischer [Fri, 7 Jan 2011 04:29:02 +0000 (20:29 -0800)]
am
06d19ef0: Merge "Import translations for additional languages." into gingerbread
* commit '
06d19ef0a0f29d9a0bec63097ec443815512e9b1':
Import translations for additional languages.
Jeff Hamilton [Fri, 7 Jan 2011 04:28:52 +0000 (20:28 -0800)]
am
0aea1836: Merge "Make the new NFC APIs public." into gingerbread
* commit '
0aea1836152da049273e581051a878381dcbd73d':
Make the new NFC APIs public.
Dianne Hackborn [Fri, 7 Jan 2011 04:28:44 +0000 (20:28 -0800)]
am
3ea5728e: Tweak level at which we reset battery stats to 90%.
* commit '
3ea5728e703554f8ba0bb3aa1367d6dc45d704bb':
Tweak level at which we reset battery stats to 90%.
Gilles Debunne [Fri, 7 Jan 2011 02:30:26 +0000 (18:30 -0800)]
Merge "Ran fixPngMetaTags on all the core/res assets." into gingerbread
Gilles Debunne [Fri, 7 Jan 2011 02:29:59 +0000 (18:29 -0800)]
Merge "Asset cleanup. DO NOT MERGE" into gingerbread
Eric Fischer [Thu, 6 Jan 2011 22:11:47 +0000 (14:11 -0800)]
Merge "Import translations for additional languages." into gingerbread
Jeff Hamilton [Thu, 6 Jan 2011 19:28:42 +0000 (11:28 -0800)]
Merge "Make the new NFC APIs public." into gingerbread
Dianne Hackborn [Thu, 6 Jan 2011 03:28:33 +0000 (19:28 -0800)]
am
3769240b: Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
* commit '
3769240b7976bfa50bb7bf235747b7f6bb7be08e':
Clear reference to the IIntentReceiver in order to avoid memory leak
Johannes Carlsson [Thu, 6 Jan 2011 03:13:29 +0000 (19:13 -0800)]
am
b5a8654d: Clear reference to the IIntentReceiver in order to avoid memory leak
* commit '
b5a8654dea9ea8443b41f8ff3668ae4074e13a07':
Clear reference to the IIntentReceiver in order to avoid memory leak
Dianne Hackborn [Thu, 6 Jan 2011 03:10:15 +0000 (19:10 -0800)]
Merge "Clear reference to the IIntentReceiver in order to avoid memory leak"
Dianne Hackborn [Thu, 6 Jan 2011 02:55:57 +0000 (18:55 -0800)]
am
c91f9fe5: Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
* commit '
c91f9fe542fd1ca9d6da432faeba60d35c4d5c49':
Avoiding cyclic references when unbinding from a service
Dianne Hackborn [Thu, 6 Jan 2011 02:54:19 +0000 (18:54 -0800)]
Merge "Avoiding cyclic references when unbinding from a service" into gingerbread
James Dong [Thu, 6 Jan 2011 01:55:27 +0000 (17:55 -0800)]
am
35e8dcb9: Merge "Suppress the recording sound in the recorded video" into gingerbread
* commit '
35e8dcb9df8c3d77ede120e3f1aaf842b2928639':
Suppress the recording sound in the recorded video
James Dong [Thu, 6 Jan 2011 01:53:18 +0000 (17:53 -0800)]
Merge "Suppress the recording sound in the recorded video" into gingerbread
Brad Fitzpatrick [Wed, 5 Jan 2011 21:52:53 +0000 (13:52 -0800)]
am
69ea4e15: Documentation fixes found over vacation hacking.
* commit '
69ea4e15e52c456537575d21443ac1efdb03a902':
Documentation fixes found over vacation hacking.
Nick Pelly [Wed, 5 Jan 2011 02:33:41 +0000 (18:33 -0800)]
am
8d98aebe: Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
* commit '
8d98aebe286be0ca963232afce3d5ceec67d3d7a':
Fix technology extra naming for IsoDep and NfcB (API part).
Nick Pelly [Wed, 5 Jan 2011 02:31:19 +0000 (18:31 -0800)]
Merge "Fix technology extra naming for IsoDep and NfcB (API part)." into gingerbread
Hung-ying Tyan [Wed, 5 Jan 2011 01:47:47 +0000 (17:47 -0800)]
am
273d2ea3: Merge "Fix setting audio group mode in SipPhone." into gingerbread
* commit '
273d2ea3f986f1611d2cf303cc5b93f820c14dd3':
Fix setting audio group mode in SipPhone.
Hung-ying Tyan [Wed, 5 Jan 2011 01:45:36 +0000 (17:45 -0800)]
Merge "Fix setting audio group mode in SipPhone." into gingerbread
Chia-chi Yeh [Wed, 5 Jan 2011 01:37:17 +0000 (17:37 -0800)]
am
3cf71376: RTP: Send silence packets on idle streams for every second.
* commit '
3cf71376421f942d06b30101fbf0df7f3b23fbdd':
RTP: Send silence packets on idle streams for every second.
Eric Laurent [Tue, 4 Jan 2011 19:58:04 +0000 (11:58 -0800)]
Fix issue
3302649.
The cause of the problem is that AudioTrack::start() can fail if it is called from a newly created
thread that has the same ID as the AudioTrack callback thread that has just been stopped and not yet exited.
This is possible as the thread ID used by the Thread class is not the TID.
The fix consists in clearing the thread ID before exiting the thread loop.
Change-Id: I66e679665c384403cb3ba2c31746f5de72d5836d
Nick Pelly [Tue, 4 Jan 2011 06:39:42 +0000 (22:39 -0800)]
am
8f49c025: Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
* commit '
8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35':
Added response flags and DSFID extras for NfcV technology (API part).
Nick Pelly [Tue, 4 Jan 2011 06:38:14 +0000 (22:38 -0800)]
Merge "Added response flags and DSFID extras for NfcV technology (API part)." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 06:35:49 +0000 (22:35 -0800)]
am
a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit '
a743448a1b34d950b1e6f06e308ce113cbc9abcb':
Tweak Ndef.getType() API. Rename constants, expand javadoc.
Nick Pelly [Tue, 4 Jan 2011 06:32:56 +0000 (22:32 -0800)]
Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 05:01:01 +0000 (21:01 -0800)]
am
163bd407: Merge "Added getType() to NDEF technology class (API part)." into gingerbread
* commit '
163bd407492bbadcdc8f0759191e1b9142d06859':
Added getType() to NDEF technology class (API part).
Nick Pelly [Tue, 4 Jan 2011 04:58:26 +0000 (20:58 -0800)]
Merge "Added getType() to NDEF technology class (API part)." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 04:11:08 +0000 (20:11 -0800)]
am
8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbread
* commit '
8c09ef91aef0706a012e449ba3d16c03e0d64508':
Removed selectAid() from IsoDep.
Nick Pelly [Tue, 4 Jan 2011 04:09:03 +0000 (20:09 -0800)]
Merge "Removed selectAid() from IsoDep." into gingerbread
Nick Pelly [Tue, 4 Jan 2011 02:34:37 +0000 (18:34 -0800)]
am
4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
* commit '
4b94dee8336a1135e4fc67a5911223bb5aabad99':
Added transfer/restore convience cmds to MF Classic tech.
Nick Pelly [Tue, 4 Jan 2011 02:33:09 +0000 (18:33 -0800)]
Merge "Added transfer/restore convience cmds to MF Classic tech." into gingerbread
John Wang [Mon, 3 Jan 2011 16:46:47 +0000 (08:46 -0800)]
am
06fccc32: Merge "Clear request list while timeout." into gingerbread
* commit '
06fccc325123bf4c9ebd04ac9300b504436724fe':
Clear request list while timeout.
John Wang [Mon, 3 Jan 2011 16:44:17 +0000 (08:44 -0800)]
Merge "Clear request list while timeout." into gingerbread
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:47:42 +0000 (15:47 -0800)]
am
69ebb984: Merge "according to rfc2617, nc-value = 8LHEX"
* commit '
69ebb984f230a523dc316bdb2c9e9c28111364fd':
according to rfc2617, nc-value = 8LHEX
Jean-Baptiste Queru [Tue, 28 Dec 2010 23:33:10 +0000 (15:33 -0800)]
Merge "according to rfc2617, nc-value = 8LHEX"
Alon Albert [Tue, 28 Dec 2010 22:57:09 +0000 (14:57 -0800)]
am
672ebb61: Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
* commit '
672ebb61a755e4bbe60e4e884b1adadf186733b6':
Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op.
Alon Albert [Tue, 28 Dec 2010 22:44:51 +0000 (14:44 -0800)]
Merge "Improved ignore-backoff handling Allow a non-epidited ignore-backoff op to pass through an expidited backed off op." into gingerbread
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:39:21 +0000 (11:39 -0800)]
am
bfb5f596: Merge "Fix for writing empty strings to Parcel::writeString8()"
* commit '
bfb5f5966b36c4960b56f6de10ba261332208db9':
Fix for writing empty strings to Parcel::writeString8()
Jean-Baptiste Queru [Tue, 28 Dec 2010 19:25:50 +0000 (11:25 -0800)]
Merge "Fix for writing empty strings to Parcel::writeString8()"
Jean-Baptiste Queru [Tue, 28 Dec 2010 18:55:04 +0000 (10:55 -0800)]
am
752942ec: Merge "The phone is crashing when unknown mime content is transferred."
* commit '
752942ec4719e6a274d6ab11103ac28459cb0f0c':
The phone is crashing when unknown mime content is transferred.