OSDN Git Service
Michael Kolb [Wed, 9 Nov 2011 21:51:19 +0000 (21:51 +0000)]
am
3a77503c: am
a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1
* commit '
3a77503ca16253a702977a11406aec7a332837cb':
Remove flicker from WebTextView
Jamie Gennis [Wed, 9 Nov 2011 21:51:17 +0000 (21:51 +0000)]
am
7e6c75f5: am
d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
* commit '
7e6c75f5a57b42edf22ce4e2cf144016252066c5':
SurfaceTexture: unhide setDefaultBufferSize
Jamie Gennis [Wed, 9 Nov 2011 21:51:16 +0000 (21:51 +0000)]
am
3cb007e4: am
911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1
* commit '
3cb007e44db1e169747528f62a118575f3b04d56':
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
Mathias Agopian [Wed, 9 Nov 2011 21:51:14 +0000 (21:51 +0000)]
am
0170810c: am
95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
* commit '
0170810ce468d1b028cb65027ebc33f1375f5d3f':
Fix an issue where we could wait for a non-existing transaction
Irfan Sheriff [Wed, 9 Nov 2011 21:51:12 +0000 (21:51 +0000)]
am
1c9126c6: am
59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1
* commit '
1c9126c64b56b6465fd551680461caed2e1ea20d':
Convert soft ap config store to state machine
JP Abgrall [Wed, 9 Nov 2011 21:51:10 +0000 (21:51 +0000)]
am
b4a96805: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
* commit '
b4a96805d69b1f6281ece568b07927da2dd50872':
Dave Santoro [Wed, 9 Nov 2011 21:51:08 +0000 (21:51 +0000)]
am
8e2c5113: am
b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1
* commit '
8e2c51137cdd1917d36c3a78ff6c1a42cc8ea402':
Unhide social stream APIs for Contacts.
Adam Powell [Wed, 9 Nov 2011 21:51:06 +0000 (21:51 +0000)]
am
b7dc4a33: am
650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
* commit '
b7dc4a33166bd24cc1ce5fa8c3ef27618a54e274':
Fix the action bar menu layout to use the correct divider drawable.
Wei Huang [Wed, 9 Nov 2011 21:51:04 +0000 (21:51 +0000)]
am
e64022ca: am
ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
* commit '
e64022ca65e36c743eca260f05f245fe9d90f80c':
Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
Matthew Xie [Wed, 9 Nov 2011 21:51:01 +0000 (21:51 +0000)]
am
3a6f9ded: am
48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '
3a6f9ded543db6cb7a2842540a2b67b0356b21ae':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Dianne Hackborn [Wed, 9 Nov 2011 21:50:59 +0000 (21:50 +0000)]
am
03507014: am
665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1
* commit '
0350701422eb484d57c5c3bb1e8fa72f03ab280b':
Cleanup remote execution of perf tests.
The Android Open Source Project [Wed, 9 Nov 2011 21:50:56 +0000 (21:50 +0000)]
Adam Cohen [Wed, 9 Nov 2011 21:50:54 +0000 (21:50 +0000)]
am
068b7f02: am
75b20380: Merge "Making default widget padding public API" into ics-mr1
* commit '
068b7f02a35e969c1607f8a35c422c93ee72c8a3':
Making default widget padding public API
Glenn Kasten [Wed, 9 Nov 2011 21:19:00 +0000 (21:19 +0000)]
am
bb1b7d5c: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
Bug
5478024 drop after decode if can't drop before
Jake Hamby [Wed, 9 Nov 2011 21:18:56 +0000 (21:18 +0000)]
am
2c6539e8: am
fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
* commit '
2c6539e83ea80c62ee1a299fb686b4bdf043bfa7':
Fix exception when sending multi-page SMS with Turkish characters.
Brian Colonna [Wed, 9 Nov 2011 21:13:51 +0000 (16:13 -0500)]
resolved conflicts for merge of
7cf1eeb9 to master
Change-Id: Id125e315e24ced927f3a500135af7e5aff50cfa2
Robert Greenwalt [Wed, 9 Nov 2011 19:34:50 +0000 (19:34 +0000)]
am
604019c8: Merge "Fix build." into ics-mr1
* commit '
604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
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"
Michael Kolb [Wed, 9 Nov 2011 14:36:22 +0000 (14:36 +0000)]
am
a4293ba1: Merge "Remove flicker from WebTextView" into ics-mr1
* commit '
a4293ba1a0f1129d5879ae9eda45292ff357e20c':
Remove flicker from WebTextView
Jamie Gennis [Wed, 9 Nov 2011 14:36:15 +0000 (14:36 +0000)]
am
d211b488: Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
* commit '
d211b4882a662409b85a1f90c71e28faa9c54464':
SurfaceTexture: unhide setDefaultBufferSize
Jamie Gennis [Wed, 9 Nov 2011 14:36:14 +0000 (14:36 +0000)]
am
911263dc: Merge changes I18e5e789,I5cbaae2d into ics-mr1
* commit '
911263dc5df48b89e8f9010fb74dfe2649bdc442':
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
Mathias Agopian [Wed, 9 Nov 2011 14:36:11 +0000 (14:36 +0000)]
am
95482b61: Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
* commit '
95482b61c348fc54bf44a96a8b73011c90b40520':
Fix an issue where we could wait for a non-existing transaction
Irfan Sheriff [Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)]
am
59c73b92: Merge "Convert soft ap config store to state machine" into ics-mr1
* commit '
59c73b92a9ef8df5d4873bc36f05b776c3a476bc':
Convert soft ap config store to state machine
JP Abgrall [Wed, 9 Nov 2011 14:36:09 +0000 (14:36 +0000)]
Merge branch 'ics-mr1-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
Dave Santoro [Wed, 9 Nov 2011 14:36:00 +0000 (14:36 +0000)]
am
b78ae752: Merge "Unhide social stream APIs for Contacts." into ics-mr1
* commit '
b78ae7524eecbca01a53994d6872202633c8341b':
Unhide social stream APIs for Contacts.
Adam Powell [Wed, 9 Nov 2011 14:35:59 +0000 (14:35 +0000)]
am
650a3e88: Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
* commit '
650a3e8894c6d26b258d26bdec856fde7aba43d6':
Fix the action bar menu layout to use the correct divider drawable.
Wei Huang [Wed, 9 Nov 2011 14:35:56 +0000 (14:35 +0000)]
am
ea50748b: Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
* commit '
ea50748b546e7dc21dc06195af5f0a8f2b812417':
Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA.
Matthew Xie [Wed, 9 Nov 2011 14:35:53 +0000 (14:35 +0000)]
am
48542eb3: Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '
48542eb39e55f2d0e2a79d43e696ffb2acb67b5c':
Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp
Dianne Hackborn [Wed, 9 Nov 2011 14:35:51 +0000 (14:35 +0000)]
am
665e105f: Merge "Cleanup remote execution of perf tests." into ics-mr1
* commit '
665e105f145fcb27a54d53c6c9382bebf50a56d7':
Cleanup remote execution of perf tests.
The Android Open Source Project [Wed, 9 Nov 2011 14:35:48 +0000 (14:35 +0000)]
am
6dee1a9d: Reconcile with ics-mr0-release
* commit '
6dee1a9d046458134fb019669b5ffe7911dcdb29':
Adam Cohen [Wed, 9 Nov 2011 14:35:45 +0000 (14:35 +0000)]
am
75b20380: Merge "Making default widget padding public API" into ics-mr1
* commit '
75b2038004f3338c68c9a0e89b29a31e10b237da':
Making default widget padding public API
Glenn Kasten [Wed, 9 Nov 2011 14:35:18 +0000 (14:35 +0000)]
am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
19998120f53caceb620f138c6eea182f1e693660':
Bug
5478024 drop after decode if can't drop before
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."
Glenn Kasten [Wed, 9 Nov 2011 01:31:32 +0000 (17:31 -0800)]
Merge "Bug
5478024 drop after decode if can't drop before" into ics-mr0
Michael Kolb [Wed, 9 Nov 2011 00:34:53 +0000 (16:34 -0800)]
Merge "Remove flicker from WebTextView" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:15:26 +0000 (16:15 -0800)]
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
Jamie Gennis [Wed, 9 Nov 2011 00:14:44 +0000 (16:14 -0800)]
Merge changes I18e5e789,I5cbaae2d into ics-mr1
* changes:
EGL: implement loading and saving the cache
EGL: use an in-memory the blob cache
Fabrice Di Meglio [Tue, 8 Nov 2011 23:57:40 +0000 (15:57 -0800)]
Merge "Fix bug #
5559439 Bogus tab title in browser"
Mathias Agopian [Tue, 8 Nov 2011 23:55:55 +0000 (15:55 -0800)]
Merge "Fix an issue where we could wait for a non-existing transaction" into ics-mr1
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)"
Jamie Gennis [Tue, 8 Nov 2011 01:03:54 +0000 (17:03 -0800)]
EGL: implement loading and saving the cache
This change adds support for saving and loading the contents of the EGL
cache. It also adds some simple tests for the EGL cache.
Change-Id: I18e5e789e0897a0783d29d1c1e64d26de2dd44c4
Irfan Sheriff [Tue, 8 Nov 2011 23:51:43 +0000 (15:51 -0800)]
Merge "Convert soft ap config store to state machine" into ics-mr1
Dave Santoro [Tue, 8 Nov 2011 22:48:21 +0000 (14:48 -0800)]
Merge "Unhide social stream APIs for Contacts." into ics-mr1
Adam Powell [Tue, 8 Nov 2011 22:32:29 +0000 (14:32 -0800)]
Merge "Fix the action bar menu layout to use the correct divider drawable." into ics-mr1
Jake Hamby [Tue, 8 Nov 2011 22:02:49 +0000 (22:02 +0000)]
am
fee5f29b: Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
* commit '
fee5f29b22f99bd2891fb2af54669f20832fb851':
Fix exception when sending multi-page SMS with Turkish characters.
Brian Colonna [Tue, 8 Nov 2011 22:02:48 +0000 (22:02 +0000)]
am
04217efb: Merge "Fix
5514230: preventing null window token from occurring" into ics-mr0
* commit '
04217efb8eaebdbd846671a2f743fa3e960b5dde':
Fix
5514230: preventing null window token from occurring
Jake Hamby [Tue, 8 Nov 2011 21:22:34 +0000 (13:22 -0800)]
Merge "Fix exception when sending multi-page SMS with Turkish characters." into ics-mr0
Wei Huang [Tue, 8 Nov 2011 21:16:02 +0000 (13:16 -0800)]
Merge "Change slide-to-camera intent to INTENT_ACTION_STILL_IMAGE_CAMERA." into ics-mr1
Brian Colonna [Tue, 8 Nov 2011 20:51:36 +0000 (12:51 -0800)]
Merge "Fix
5514230: preventing null window token from occurring" into ics-mr0
Matthew Xie [Tue, 8 Nov 2011 20:19:37 +0000 (12:19 -0800)]
Merge "Make public APIs of ACTION_UUID, EXTRA_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
Dianne Hackborn [Tue, 8 Nov 2011 19:52:58 +0000 (11:52 -0800)]
Merge "Cleanup remote execution of perf tests." into ics-mr1
The Android Open Source Project [Tue, 8 Nov 2011 19:08:20 +0000 (11:08 -0800)]
Reconcile with ics-mr0-release
Change-Id: I382741a2a6c99247d214583ee0488cf1ab9c3ce3
Adam Cohen [Tue, 8 Nov 2011 18:53:39 +0000 (10:53 -0800)]
Merge "Making default widget padding public API" into ics-mr1
Andreas Huber [Tue, 8 Nov 2011 18:40:20 +0000 (10:40 -0800)]
resolved conflicts for merge of
26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
Robert Greenwalt [Tue, 8 Nov 2011 18:31:37 +0000 (10:31 -0800)]
Merge "Fix build." into ics-mr1
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
The Android Automerger [Tue, 8 Nov 2011 14:41:10 +0000 (06:41 -0800)]
merge in ics-mr0-release history after reset to ics-mr0
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:58:03 +0000 (21:58 -0800)]
Fix an issue where we could wait for a non-existing transaction
This fixes the issue:
"Call not sent" dialog takes too long to dismiss after hitting OK"
Note: the system would recover after a 5 second timeout.
Bug:
5534520
Change-Id: Ifa37e594b50581f498479a5858672441b3d7dd87
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
OSDN Git Service
