OSDN Git Service
Adam Powell [Wed, 9 Nov 2011 19:34:47 +0000 (19:34 +0000)]
am
8689afbd: Merge "Fix bug
5544103 - Spinner text doesn\'t look dimmed when disabled" into ics-mr1
* commit '
8689afbd63db3b1af6058709da843ea9d6433b21':
Fix bug
5544103 - Spinner text doesn't look dimmed when disabled
Danielle Millett [Wed, 9 Nov 2011 19:34:44 +0000 (19:34 +0000)]
am
b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
* commit '
b9b08257370d244b4bccc4e243dda3c4daf4b0af':
Showing a congratulations screen after choosing face unlock backup lock
Steve Block [Wed, 9 Nov 2011 17:43:53 +0000 (09:43 -0800)]
Merge "Clean up JavaDoc for WebView.addJavascriptInterface()"
Robert Greenwalt [Wed, 9 Nov 2011 17:10:42 +0000 (09:10 -0800)]
Merge "resolved conflicts for merge of
ea54b760 to master"
Robert Greenwalt [Wed, 9 Nov 2011 16:59:23 +0000 (08:59 -0800)]
resolved conflicts for merge of
ea54b760 to master
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
Steve Block [Wed, 9 Nov 2011 16:49:37 +0000 (08:49 -0800)]
Merge "Add another test for WebView's Java Bridge"
Tom Taylor [Wed, 9 Nov 2011 14:34:18 +0000 (14:34 +0000)]
am
1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
* commit '
1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
Add new secure setting for controlling Messaging notifications
Kristian Monsen [Wed, 9 Nov 2011 11:35:01 +0000 (03:35 -0800)]
Merge "Part of fix for bug
5584571 Add HTTP request header with app name"
David 'Digit' Turner [Wed, 9 Nov 2011 10:18:02 +0000 (02:18 -0800)]
Merge "NDK: ANativeActivity: Fix documentation for 'clazz' member."
Flavio Lerda [Wed, 9 Nov 2011 10:13:41 +0000 (02:13 -0800)]
Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid."
Jeff Brown [Wed, 9 Nov 2011 04:41:09 +0000 (20:41 -0800)]
Merge "Fix JavaDoc typos."
Jeff Brown [Wed, 9 Nov 2011 04:40:55 +0000 (20:40 -0800)]
Merge "Delete dead code."
Fabrice Di Meglio [Tue, 8 Nov 2011 23:57:40 +0000 (15:57 -0800)]
Merge "Fix bug #
5559439 Bogus tab title in browser"
Fabrice Di Meglio [Tue, 8 Nov 2011 23:55:41 +0000 (15:55 -0800)]
Merge "Fix bug #
5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)"
Andreas Huber [Tue, 8 Nov 2011 18:40:20 +0000 (10:40 -0800)]
resolved conflicts for merge of
26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
Adam Powell [Tue, 8 Nov 2011 18:06:00 +0000 (10:06 -0800)]
Merge "Fix bug
5544103 - Spinner text doesn't look dimmed when disabled" into ics-mr1
Danielle Millett [Tue, 8 Nov 2011 18:03:24 +0000 (10:03 -0800)]
Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1
Robert Greenwalt [Tue, 8 Nov 2011 18:01:07 +0000 (10:01 -0800)]
Merge "Wimax : wimax framework related open source." into ics-mr1
Tom Taylor [Tue, 8 Nov 2011 17:00:22 +0000 (09:00 -0800)]
Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1
Andreas Huber [Tue, 8 Nov 2011 16:48:31 +0000 (08:48 -0800)]
Merge "Remove surface legacy APIs and code." into ics-mr1
John Reck [Tue, 8 Nov 2011 16:41:32 +0000 (16:41 +0000)]
am
99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1
* commit '
99015a2464a40097c3e23e07cdf69da0f886aa66':
Remove unnecessary memory allocations
John Reck [Tue, 8 Nov 2011 16:38:07 +0000 (08:38 -0800)]
Merge "Remove unnecessary memory allocations" into ics-mr1
Eric Laurent [Tue, 8 Nov 2011 16:37:11 +0000 (16:37 +0000)]
am
f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1
* commit '
f3a892ab9347ce733b81ccb4913a91c586f8f367':
AudioFlinger: mix track only when really ready
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
Ed Heyl [Tue, 8 Nov 2011 14:04:18 +0000 (14:04 +0000)]
am
9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
* commit '
9d6a51623fdabbe993d7b8848794607394ef7cc2':
Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
Narayan Kamath [Tue, 8 Nov 2011 10:13:39 +0000 (10:13 +0000)]
am
98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1
* commit '
98f5500c71754dad428e00d569007e0b98dc8aee':
Fix a bug in the network TTS api.
Narayan Kamath [Tue, 8 Nov 2011 10:09:18 +0000 (02:09 -0800)]
Merge "Fix a bug in the network TTS api." into ics-mr1
Gilles Debunne [Tue, 8 Nov 2011 08:53:03 +0000 (08:53 +0000)]
am
39896f52: Merge "No more context menu in TextView" into ics-mr1
* commit '
39896f52a84947ffc2062a2584033ff749d90534':
No more context menu in TextView
Gilles Debunne [Tue, 8 Nov 2011 08:48:27 +0000 (00:48 -0800)]
Merge "No more context menu in TextView" into ics-mr1
Chih-Chung Chang [Tue, 8 Nov 2011 07:04:36 +0000 (07:04 +0000)]
am
713c9a33: Merge "Fix
5509346: Resize the thumbnails if it\'s too large." into ics-mr1
* commit '
713c9a331e226c970af57c59ff17be29b73025c1':
Fix
5509346: Resize the thumbnails if it's too large.
James Dong [Tue, 8 Nov 2011 07:00:34 +0000 (07:00 +0000)]
am
ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
* commit '
ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
Matthew Xie [Tue, 8 Nov 2011 07:00:33 +0000 (07:00 +0000)]
am
67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '
67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
Chih-Chung Chang [Tue, 8 Nov 2011 06:59:55 +0000 (22:59 -0800)]
Merge "Fix
5509346: Resize the thumbnails if it's too large." into ics-mr1
James Dong [Tue, 8 Nov 2011 06:57:02 +0000 (22:57 -0800)]
Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
Matthew Xie [Tue, 8 Nov 2011 06:42:00 +0000 (22:42 -0800)]
Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Mathias Agopian [Tue, 8 Nov 2011 05:36:46 +0000 (05:36 +0000)]
am
7f1c94e1: Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
* commit '
7f1c94e198e051bf481fd2d286c7b33d00664f9d':
Fix rotation displays frame N-1 briefly while rotating
Mathias Agopian [Tue, 8 Nov 2011 05:33:53 +0000 (21:33 -0800)]
Merge "Fix rotation displays frame N-1 briefly while rotating" into ics-mr1
Jeff Brown [Tue, 8 Nov 2011 05:11:36 +0000 (21:11 -0800)]
Merge "Improve JavaDoc on AtomicFile."
Daniel Sandler [Tue, 8 Nov 2011 03:50:34 +0000 (03:50 +0000)]
am
c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
* commit '
c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
Fix scaling on notification panel wifi/battery icons.
Daniel Sandler [Tue, 8 Nov 2011 03:47:51 +0000 (19:47 -0800)]
Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1
Dianne Hackborn [Tue, 8 Nov 2011 02:51:40 +0000 (02:51 +0000)]
am
84b02130: Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
* commit '
84b02130a9b3327343425cd4edfc1b85f1e9b23d':
Update perf tests to always run each test in a fresh process.
Dianne Hackborn [Tue, 8 Nov 2011 02:46:54 +0000 (18:46 -0800)]
Merge "Update perf tests to always run each test in a fresh process." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 01:59:52 +0000 (01:59 +0000)]
am
13194b16: Merge "Fix bug
5534414 - Unselected tab states for Holo" into ics-mr1
* commit '
13194b16d071ce70453a49e9462cfbeb7460d633':
Fix bug
5534414 - Unselected tab states for Holo
Adam Powell [Tue, 8 Nov 2011 01:55:17 +0000 (17:55 -0800)]
Merge "Fix bug
5534414 - Unselected tab states for Holo" into ics-mr1
John Wang [Tue, 8 Nov 2011 00:50:36 +0000 (00:50 +0000)]
am
2f99bb5e: Merge "Remain in call audio mode while phone is offhook." into ics-mr1
* commit '
2f99bb5e4f706fee3dc1e08bdd66f58ea9844b09':
Remain in call audio mode while phone is offhook.
John Wang [Tue, 8 Nov 2011 00:46:11 +0000 (16:46 -0800)]
Merge "Remain in call audio mode while phone is offhook." into ics-mr1
Robert Greenwalt [Mon, 7 Nov 2011 23:41:20 +0000 (23:41 +0000)]
am
2d9ccdb4: am
b445362b: Make upstream tether list threadsafe
* commit '
2d9ccdb4abd393375c5ae99445afbb8b0855d25c':
Make upstream tether list threadsafe
Robert Greenwalt [Mon, 7 Nov 2011 23:36:28 +0000 (23:36 +0000)]
am
b445362b: Make upstream tether list threadsafe
* commit '
b445362bd67cf596cfdd39db2dbe8f42cf9a119a':
Make upstream tether list threadsafe
John Reck [Mon, 7 Nov 2011 23:25:13 +0000 (23:25 +0000)]
am
669e1f80: Merge "Remove nativeRecordButtons" into ics-mr1
* commit '
669e1f80a718dc2a4d259970b4e85b3c66e8ebc1':
Remove nativeRecordButtons
John Reck [Mon, 7 Nov 2011 23:20:38 +0000 (15:20 -0800)]
Merge "Remove nativeRecordButtons" into ics-mr1
Andreas Huber [Mon, 7 Nov 2011 23:04:56 +0000 (15:04 -0800)]
Merge "Use binary search to discover closest sync sample index, replace"
Svetoslav Ganov [Mon, 7 Nov 2011 23:03:07 +0000 (15:03 -0800)]
Merge "NumberPicker does not hide IME when flinged."
Adam Powell [Mon, 7 Nov 2011 23:01:48 +0000 (23:01 +0000)]
am
b1dbf8e6: Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
* commit '
b1dbf8e605c29ac00dde187579bd8ff8f18d7ba3':
Change the "start deferred" fragment API to "user visible hint"
Adam Powell [Mon, 7 Nov 2011 22:56:36 +0000 (14:56 -0800)]
Merge "Change the "start deferred" fragment API to "user visible hint"" into ics-mr1
Peter Ng [Mon, 7 Nov 2011 22:41:13 +0000 (22:41 +0000)]
am
e1aacdfe: Merge "Added focused state to quickcontacts shortcut" into ics-mr1
* commit '
e1aacdfe26eabf1ff31a6ddd8590fdea360614db':
Added focused state to quickcontacts shortcut
Peter Ng [Mon, 7 Nov 2011 22:37:31 +0000 (14:37 -0800)]
Merge "Added focused state to quickcontacts shortcut" into ics-mr1
Justin Ho [Mon, 7 Nov 2011 22:33:35 +0000 (14:33 -0800)]
Merge "Merge: Correctly updating Roboto HHEA table to master Bug:
5516773"
Jim Miller [Mon, 7 Nov 2011 22:29:08 +0000 (22:29 +0000)]
am
4d8ecc65: Merge "Fix
5231823: PIN/Password polish on lock screen" into ics-mr1
* commit '
4d8ecc65c5a747f350492b21397d7466ff628900':
Fix
5231823: PIN/Password polish on lock screen
Jim Miller [Mon, 7 Nov 2011 22:24:43 +0000 (14:24 -0800)]
Merge "Fix
5231823: PIN/Password polish on lock screen" into ics-mr1
Jeff Brown [Mon, 7 Nov 2011 22:05:22 +0000 (14:05 -0800)]
Merge "Fix possible leak in Parcel::writeDupFileDescriptor."
Peter Ng [Mon, 7 Nov 2011 21:44:33 +0000 (21:44 +0000)]
am
a50c859d: Merge "Color balancing framework assets" into ics-mr1
* commit '
a50c859d3f071b9d405bf461e34f11d40f20561e':
Color balancing framework assets
Peter Ng [Mon, 7 Nov 2011 21:40:45 +0000 (13:40 -0800)]
Merge "Color balancing framework assets" into ics-mr1
Eric Fischer [Mon, 7 Nov 2011 20:41:00 +0000 (20:41 +0000)]
am
08be43a6: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
08be43a6d912fe1f34596d5e90df6b497424af02':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 7 Nov 2011 20:36:02 +0000 (12:36 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Jeff Brown [Sat, 5 Nov 2011 03:19:33 +0000 (20:19 -0700)]
Fix possible leak in Parcel::writeDupFileDescriptor.
Also, check the result of dup() just in case we got EMFILE
or something.
Change-Id: I18e627bd84f4c7941813fe1c2bad2cdd9e5afa83
Amith Yamasani [Mon, 7 Nov 2011 19:01:22 +0000 (19:01 +0000)]
am
7919bfb1: Merge "Don\'t show the submit button when it isn\'t enabled." into ics-mr1
* commit '
7919bfb12365b3f84e232235c35df957039995b7':
Don't show the submit button when it isn't enabled.
Amith Yamasani [Mon, 7 Nov 2011 18:57:17 +0000 (10:57 -0800)]
Merge "Don't show the submit button when it isn't enabled." into ics-mr1
Winson Chung [Mon, 7 Nov 2011 18:24:01 +0000 (18:24 +0000)]
am
19c86cac: Merge "Fixing screenshot border asset." into ics-mr1
* commit '
19c86cacb2f0ba04cc93084ba474662afb17d88f':
Fixing screenshot border asset.
Winson Chung [Mon, 7 Nov 2011 18:20:37 +0000 (10:20 -0800)]
Merge "Fixing screenshot border asset." into ics-mr1
Daniel Sandler [Mon, 7 Nov 2011 18:15:30 +0000 (18:15 +0000)]
am
010bb273: Merge changes I0da0f04f,I93197665 into ics-mr1
* commit '
010bb273a58444f907bb82f62f8d7274f9637b49':
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
Daniel Sandler [Mon, 7 Nov 2011 18:11:52 +0000 (10:11 -0800)]
Merge changes I0da0f04f,I93197665 into ics-mr1
* changes:
Offer the user an option to launch Dreams when docked.
Teach UiModeMgr about high-end and low-end desk docks.
Alex Sakhartchouk [Mon, 7 Nov 2011 17:53:28 +0000 (09:53 -0800)]
Merge "Properly passing an unused variable through."
The Android Open Source Project [Mon, 7 Nov 2011 16:30:54 +0000 (08:30 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
The Android Open Source Project [Mon, 7 Nov 2011 16:28:26 +0000 (16:28 +0000)]
am
064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
The Android Open Source Project [Mon, 7 Nov 2011 16:22:56 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
Dianne Hackborn [Mon, 7 Nov 2011 15:51:38 +0000 (15:51 +0000)]
am
6581043a: am
7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '
6581043a44ab46a47f09080eeb7c9fc9d0a2d0c0':
Print out memory info when we get into a low memory situation.
Mathias Agopian [Mon, 7 Nov 2011 15:51:33 +0000 (15:51 +0000)]
am
3f24589e: Merge "workaround to set the WM refresh rate to 48 Hz for tuna devices only" into ics-mr1
* commit '
3f24589edd860618ccf65d6653b002d13810e78b':
workaround to set the WM refresh rate to 48 Hz for tuna devices only
Jeff Brown [Mon, 7 Nov 2011 15:51:31 +0000 (15:51 +0000)]
am
88061d6b: am
5462bc63: Fix a leak in Parcel::writeBlob.
* commit '
88061d6b38cfb4bf374039846b753a3b21ac61e1':
Fix a leak in Parcel::writeBlob.
Steve Block [Mon, 7 Nov 2011 15:37:53 +0000 (07:37 -0800)]
Merge changes If1bdd547,Ie43c16ae,I62b45f8b,I32b7fdc0
* changes:
Add tests for the fields of objects in the WebView's Java Bridge.
Adds a set of basic test for WebView's Java Bridge
Add tests for returning values from WebView's Java Bridge
Adds a new test for type coercion in WebView's Java Bridge
The Android Automerger [Sun, 6 Nov 2011 14:46:10 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 6 Nov 2011 14:28:19 +0000 (06:28 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
Romain Guy [Sat, 5 Nov 2011 19:33:49 +0000 (19:33 +0000)]
am
2ccc47b8: Merge "Memory optimizations for libhwui Bug #
5566149" into ics-mr1
* commit '
2ccc47b89868d4f39683e0e2bd057ce95d7d1217':
Memory optimizations for libhwui Bug #
5566149
Robert Greenwalt [Sat, 5 Nov 2011 19:33:46 +0000 (19:33 +0000)]
am
fd900f05: am
348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '
fd900f05fb67046b97701f20626f7fd408fd8990':
Start using IP tool for advanced routing.
Jamie Gennis [Sat, 5 Nov 2011 19:33:42 +0000 (19:33 +0000)]
am
2ab7ec90: Merge "EGL: Add stubs for EGL_ANDROID_blob_cache" into ics-mr1
* commit '
2ab7ec90e4a6f21bee7cbfebbd751d32d4cf9e03':
EGL: Add stubs for EGL_ANDROID_blob_cache
Dianne Hackborn [Sat, 5 Nov 2011 19:33:39 +0000 (19:33 +0000)]
am
960177ae: (-s ours) am
ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0
* commit '
960177ae394a466d765a2dc171e136f9fdea06b6':
DO NOT MERGE. Integrate: Include showmap output in bug report.
Dave Burke [Sat, 5 Nov 2011 19:33:33 +0000 (19:33 +0000)]
am
a3af4c94: am
3ee47188: Frame rate to 48 fps
* commit '
a3af4c94dfbf3336004a38011f6453bfcd7fd638':
Frame rate to 48 fps
Mathias Agopian [Sat, 5 Nov 2011 19:33:18 +0000 (19:33 +0000)]
am
515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1
* commit '
515c6b44d57b829792267594a355cd2831582197':
fix an issue where SensorService could request an invalid sensor delay
Irfan Sheriff [Sat, 5 Nov 2011 19:33:16 +0000 (19:33 +0000)]
am
45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1
* commit '
45a04db3f95755829b24043d30d7da7182b4f33b':
Avoid quick shutdown after a driver start
Narayan Kamath [Sat, 5 Nov 2011 19:33:11 +0000 (19:33 +0000)]
am
eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1
* commit '
eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
Add an API for querying / enabling network TTS support.
Chet Haase [Sat, 5 Nov 2011 19:01:51 +0000 (12:01 -0700)]
resolved conflicts for merge of
aa4d2f69 to master
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
Dianne Hackborn [Sat, 5 Nov 2011 16:40:10 +0000 (16:40 +0000)]
am
55fe6763: Merge "Include showmap output in bug report." into ics-mr1
* commit '
55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
Include showmap output in bug report.
Amith Yamasani [Sat, 5 Nov 2011 16:40:07 +0000 (16:40 +0000)]
am
d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1
* commit '
d69c203cd48c1d0d3be92fb0396656ee8adc1185':
Close suggestions cursor when SearchView is detached.
Flavio Lerda [Sat, 5 Nov 2011 16:40:01 +0000 (16:40 +0000)]
am
8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1
* commit '
8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
Add a query parameter to look-up a SIP address.
Eric Laurent [Sat, 5 Nov 2011 16:32:35 +0000 (09:32 -0700)]
resolved conflicts for merge of
914972be to master
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
Eric Laurent [Sat, 5 Nov 2011 15:56:06 +0000 (08:56 -0700)]
Merge "resolved conflicts for merge of
79178b8b to master"
Eric Laurent [Sat, 5 Nov 2011 15:52:20 +0000 (08:52 -0700)]
resolved conflicts for merge of
79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
Dianne Hackborn [Sat, 5 Nov 2011 07:34:03 +0000 (07:34 +0000)]
am
7311bd4b: Merge "Print out memory info when we get into a low memory situation." into ics-mr0
* commit '
7311bd4b709750384b058d8e988e2e983c97b3f2':
Print out memory info when we get into a low memory situation.
The Android Automerger [Sat, 5 Nov 2011 07:33:21 +0000 (00:33 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sat, 5 Nov 2011 07:31:17 +0000 (00:31 -0700)]
Merge "Print out memory info when we get into a low memory situation." into ics-mr0
Jeff Brown [Sat, 5 Nov 2011 02:01:44 +0000 (19:01 -0700)]
Fix a leak in Parcel::writeBlob.
Was mistakenly assuming that Parcel::writeFileDescriptor took
ownership of the fd that was passed in. It does not!
Added some comments and a default parameter to allow the caller
to specify whether it wishes the Parcel to take ownership.
Bug:
5563374
Change-Id: I5a12f51d582bf246ce90133cce7690bb9bca93f6
OSDN Git Service
