git.osdn.net Git - android-x86/frameworks-native.git/log

Benoit Goby [Tue, 12 Apr 2011 01:53:57 +0000 (18:53 -0700)]

am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE

* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters

commit | commitdiff | tree

Benoit Goby [Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)]

resolved conflicts for merge of 08c39c6a to honeycomb-LTE

Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92

commit | commitdiff | tree

Brad Fitzpatrick [Tue, 12 Apr 2011 00:27:12 +0000 (17:27 -0700)]

am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"

* commit '4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler

commit | commitdiff | tree

Xavier Ducrohet [Tue, 12 Apr 2011 00:11:41 +0000 (17:11 -0700)]

resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp

Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342

commit | commitdiff | tree

Xavier Ducrohet [Mon, 11 Apr 2011 23:15:54 +0000 (16:15 -0700)]

resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp

Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701

commit | commitdiff | tree

Mike Lockwood [Mon, 11 Apr 2011 21:24:11 +0000 (14:24 -0700)]

am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak

* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
UsbManager: minor Javadoc tweak

commit | commitdiff | tree

Jason parks [Mon, 11 Apr 2011 21:24:06 +0000 (14:24 -0700)]

am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread

* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.

commit | commitdiff | tree

Jeff Hamilton [Mon, 11 Apr 2011 21:23:59 +0000 (14:23 -0700)]

am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.

* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.

commit | commitdiff | tree

James Dong [Mon, 11 Apr 2011 21:23:52 +0000 (14:23 -0700)]

am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread

* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:46:38 +0000 (12:46 -0700)]

am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)

commit | commitdiff | tree

Glenn Kasten [Mon, 11 Apr 2011 19:43:28 +0000 (12:43 -0700)]

am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)

* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)

commit | commitdiff | tree

Wink Saville [Mon, 11 Apr 2011 19:08:19 +0000 (12:08 -0700)]

am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE

* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.

commit | commitdiff | tree

Wink Saville [Mon, 11 Apr 2011 19:04:47 +0000 (12:04 -0700)]

Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE

commit | commitdiff | tree

Freeman Ng [Mon, 11 Apr 2011 18:19:18 +0000 (11:19 -0700)]

am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE

* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings

commit | commitdiff | tree

Freeman Ng [Mon, 11 Apr 2011 18:10:18 +0000 (11:10 -0700)]

Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Sat, 9 Apr 2011 14:57:35 +0000 (07:57 -0700)]

am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE

* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT

commit | commitdiff | tree

Wink Saville [Sat, 9 Apr 2011 14:50:37 +0000 (07:50 -0700)]

Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE

commit | commitdiff | tree

Jamie Gennis [Sat, 9 Apr 2011 00:41:38 +0000 (17:41 -0700)]

am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.

commit | commitdiff | tree

Jamie Gennis [Sat, 9 Apr 2011 00:40:00 +0000 (17:40 -0700)]

am 66380f76: Stagefright: authenticate ANativeWindow.

* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.

commit | commitdiff | tree

Robert Greenwalt [Sat, 9 Apr 2011 00:21:43 +0000 (17:21 -0700)]

am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE

* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.

commit | commitdiff | tree

Robert Greenwalt [Sat, 9 Apr 2011 00:19:53 +0000 (17:19 -0700)]

Merge "Make ApnSettings threadsafe." into honeycomb-LTE

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 23:38:39 +0000 (16:38 -0700)]

am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 23:38:34 +0000 (16:38 -0700)]

am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE

* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 23:31:03 +0000 (16:31 -0700)]

Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 23:22:06 +0000 (16:22 -0700)]

Merge "Fix notification of disconnected networks." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Fri, 8 Apr 2011 20:23:24 +0000 (13:23 -0700)]

am 73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

* commit '73ad388aae28213dd3f47bcac1b52c671e3cacc7':
Check different CellLocation type in GsmDataConnectionTracker

commit | commitdiff | tree

Wink Saville [Fri, 8 Apr 2011 20:20:20 +0000 (13:20 -0700)]

Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 19:23:49 +0000 (12:23 -0700)]

am 63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.

* commit '63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.

commit | commitdiff | tree

Wink Saville [Fri, 8 Apr 2011 18:35:11 +0000 (11:35 -0700)]

am 5203a5bc: Cleanup debugging.

* commit '5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.

commit | commitdiff | tree

Wink Saville [Fri, 8 Apr 2011 17:41:09 +0000 (10:41 -0700)]

am 1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

* commit '1905e166ed40ee11e80476848ef40e817512f740':
DataConnection: set CID to the correct value.

commit | commitdiff | tree

Wink Saville [Fri, 8 Apr 2011 17:38:25 +0000 (10:38 -0700)]

Merge "DataConnection: set CID to the correct value." into honeycomb-LTE

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 17:09:03 +0000 (10:09 -0700)]

am 9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

* commit '9c7f433c80fd2014562f8d161e6a34710fe475d6':
Fix isApnTypeActive in GDCT.

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 17:07:31 +0000 (10:07 -0700)]

Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE

commit | commitdiff | tree

Robert Greenwalt [Fri, 8 Apr 2011 17:05:01 +0000 (10:05 -0700)]

am 4410660e: Fix ISO country code of Slovenia.

* commit '4410660e02c04b29d323c6d3bf81633fd07b6411':
Fix ISO country code of Slovenia.

commit | commitdiff | tree

Nicolas Roard [Fri, 8 Apr 2011 00:25:56 +0000 (17:25 -0700)]

am 3e37a2f3: am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit '3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
Remove uncalled function -- java counterpart of the fix for bug:4183801

commit | commitdiff | tree

Nicolas Roard [Fri, 8 Apr 2011 00:24:05 +0000 (17:24 -0700)]

am fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

* commit 'fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
Remove uncalled function -- java counterpart of the fix for bug:4183801

commit | commitdiff | tree

Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]

Merge "Remove uncalled function -- java counterpart of the fix for bug:4183801" into honeycomb-mr1

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 23:51:50 +0000 (16:51 -0700)]

am 7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

* commit '7183a7a584397142ab7347d6f721011d743fb699':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 23:49:02 +0000 (16:49 -0700)]

Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE

commit | commitdiff | tree

Bill Gruber [Thu, 7 Apr 2011 22:17:26 +0000 (15:17 -0700)]

am 216d9894: am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '216d98949ddeb84359836594ab00be158d69545e':
IAB docs--status codes fix Bug: 4208641

commit | commitdiff | tree

Bill Gruber [Thu, 7 Apr 2011 22:14:54 +0000 (15:14 -0700)]

am 6bb8b0ec: am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit '6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
IAB docs--status codes fix Bug: 4208641

commit | commitdiff | tree

Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]

am afecd1e9: IAB docs--status codes fix Bug: 4208641

* commit 'afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug: 4208641

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 21:29:17 +0000 (14:29 -0700)]

am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit '9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
ConnectivityService needs to use the new names for the NetConfig vars.

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 21:28:06 +0000 (14:28 -0700)]

Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)]

am 29fa50be: am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit '29fa50be2484ed9d7a5e8075b764caa37b6494b9':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 21:22:33 +0000 (14:22 -0700)]

am bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* commit 'bb55777be1a3231d187205dc378ca35b01e8bc65':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master

commit | commitdiff | tree

Xavier Ducrohet [Thu, 7 Apr 2011 21:18:20 +0000 (14:18 -0700)]

am 96ac8560: am 515a08b0: Merge 59aad78e from do not merge.

* commit '96ac85607b1462508981936b1be29ae5f9e4271d':
Merge 59aad78e from master. do not merge.

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 21:17:52 +0000 (14:17 -0700)]

Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1

* changes:
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master

commit | commitdiff | tree

Robert Greenwalt [Thu, 7 Apr 2011 21:13:52 +0000 (14:13 -0700)]

resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp

Change-Id: I0962138f6ecb1ed54fda25524d8850b086f13c4f

commit | commitdiff | tree

Xavier Ducrohet [Thu, 7 Apr 2011 20:38:13 +0000 (13:38 -0700)]

am 515a08b0: Merge 59aad78e from do not merge.

* commit '515a08b01851a1ab9386f85dee6d9fd7b65ee7ad':
Merge 59aad78e from master. do not merge.

commit | commitdiff | tree

Robert Greenwalt [Thu, 7 Apr 2011 20:02:28 +0000 (13:02 -0700)]

Merge "Add external dependency API." into honeycomb-LTE

commit | commitdiff | tree

John Wang [Thu, 7 Apr 2011 19:46:21 +0000 (12:46 -0700)]

am 574d3c4b: Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

* commit '574d3c4b2cb120314b68bffa34aed2545d1b1158':
Refactor onSetupConnectionCompleted.

commit | commitdiff | tree

John Wang [Thu, 7 Apr 2011 19:46:18 +0000 (12:46 -0700)]

am 5d6f1167: Merge "Make LinkProperties comparable." into honeycomb-LTE

* commit '5d6f1167039e22889545212ce18192460f9b503e':
Make LinkProperties comparable.

commit | commitdiff | tree

John Wang [Thu, 7 Apr 2011 19:44:14 +0000 (12:44 -0700)]

Merge "Refactor onSetupConnectionCompleted." into honeycomb-LTE

commit | commitdiff | tree

John Wang [Thu, 7 Apr 2011 19:44:04 +0000 (12:44 -0700)]

Merge "Make LinkProperties comparable." into honeycomb-LTE

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 16:37:06 +0000 (09:37 -0700)]

am add31091: Merge "Add a 4G icon for LTE." into honeycomb-LTE

* commit 'add31091785c3de8df1555163cca9ee9d22c9968':
Add a 4G icon for LTE.

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 16:35:18 +0000 (09:35 -0700)]

Merge "Add a 4G icon for LTE." into honeycomb-LTE

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 16:14:50 +0000 (09:14 -0700)]

am b3bb6fd5: am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b3bb6fd5e3050b6d17bc1a58906ea04e97a29e20':
Fix the issue the video can't start to play

commit | commitdiff | tree

Brad Fitzpatrick [Thu, 7 Apr 2011 16:08:58 +0000 (09:08 -0700)]

am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"

* commit 'ca7ad44a8b6764b5935143bfe55700cbddb0d990':
audioflinger: Enable ARMv5TE optimized resampler

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 16:07:52 +0000 (09:07 -0700)]

am b25181aa: Merge "Fix the issue the video can\'t start to play" into honeycomb-mr1

* commit 'b25181aaccb00fee405251bf3575ce1d40badf46':
Fix the issue the video can't start to play

commit | commitdiff | tree

Brad Fitzpatrick [Thu, 7 Apr 2011 15:57:00 +0000 (08:57 -0700)]

Merge "audioflinger: Enable ARMv5TE optimized resampler"

commit | commitdiff | tree

Teng-Hui Zhu [Thu, 7 Apr 2011 15:52:45 +0000 (08:52 -0700)]

Merge "Fix the issue the video can't start to play" into honeycomb-mr1

commit | commitdiff | tree

Xavier Ducrohet [Thu, 7 Apr 2011 02:08:11 +0000 (19:08 -0700)]

am 59aad78e: LayoutLib: don\'t render when shader\'s local matrix is set to 0 scale.

* commit '59aad78eae14939c169876b2f632d005f382cf7d':
LayoutLib: don't render when shader's local matrix is set to 0 scale.

commit | commitdiff | tree

Xavier Ducrohet [Thu, 7 Apr 2011 02:08:02 +0000 (19:08 -0700)]

am 8a18dba4: Merge c5aeac7f from honeycomb.

* commit '8a18dba48c354fc47056b07ddec8a32fda266b6a':
Merge c5aeac7f from honeycomb.

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 00:54:11 +0000 (17:54 -0700)]

am 1b87f1db: Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

* commit '1b87f1db89e82d00445a43c4593d8c5ea5d2633f':
Add getCdmaSubscriptionSource to CommandsInterface.

commit | commitdiff | tree

Wink Saville [Thu, 7 Apr 2011 00:52:22 +0000 (17:52 -0700)]

Merge "Add getCdmaSubscriptionSource to CommandsInterface." into honeycomb-LTE

commit | commitdiff | tree

Roman Nurik [Thu, 7 Apr 2011 00:25:08 +0000 (17:25 -0700)]

am e2b81c3e: am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'e2b81c3e886e47f00d54426ca82c66c6f56bc5b1':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

commit | commitdiff | tree

Roman Nurik [Thu, 7 Apr 2011 00:21:21 +0000 (17:21 -0700)]

am b17cc8a8: Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

* commit 'b17cc8a83fd819efcb79d78d005e16b3f04d08df':
Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table.

commit | commitdiff | tree

Roman Nurik [Thu, 7 Apr 2011 00:18:47 +0000 (17:18 -0700)]

Merge "Add moov/mdat and 500KB max A/V drift recommendations to Supported Media Formats doc. Also reformat encoding parameter recommendations into a single table." into honeycomb-mr1

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:16:12 +0000 (14:16 -0700)]

am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit 'ad3bddab9246933971ff1b5360b0915e55579fe7':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:12:31 +0000 (14:12 -0700)]

am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

* commit '9f2f650f26941a7cd4931afc66f39918e7c2817c':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Eric Fischer [Wed, 6 Apr 2011 21:09:32 +0000 (14:09 -0700)]

Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

commit | commitdiff | tree

Bill Gruber [Wed, 6 Apr 2011 21:04:47 +0000 (14:04 -0700)]

am 2811358f: am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '2811358f68e6f31c44f483e196f1c91692febf50':
IAB docs: fixes line break issues

commit | commitdiff | tree

Bill Gruber [Wed, 6 Apr 2011 20:58:34 +0000 (13:58 -0700)]

am 3bd37307: am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '3bd373079ed2599e5e07aa1cf702c7f8386765c3':
IAB docs: fixes line break issues

commit | commitdiff | tree

Bill Gruber [Wed, 6 Apr 2011 20:20:27 +0000 (13:20 -0700)]

am 48a1b52b: Merge "IAB docs: fixes line break issues" into honeycomb

* commit '48a1b52bc736acfe9c4723abf6db7c8befc5e43b':
IAB docs: fixes line break issues

commit | commitdiff | tree

Bill Gruber [Wed, 6 Apr 2011 19:52:41 +0000 (12:52 -0700)]

Merge "IAB docs: fixes line break issues" into honeycomb

commit | commitdiff | tree

Xavier Ducrohet [Wed, 6 Apr 2011 19:50:01 +0000 (12:50 -0700)]

am 73dc2602: am c5aeac7f: LayoutLib: Fix issue with rendering mode.

* commit '73dc2602898a300306ad418ca5bec990f0de877f':
LayoutLib: Fix issue with rendering mode.

commit | commitdiff | tree

Xavier Ducrohet [Wed, 6 Apr 2011 19:41:17 +0000 (12:41 -0700)]

am c5aeac7f: LayoutLib: Fix issue with rendering mode.

* commit 'c5aeac7f157e3cb9e29ab8c126f74e26493501f5':
LayoutLib: Fix issue with rendering mode.

commit | commitdiff | tree

Scott Main [Tue, 5 Apr 2011 21:32:15 +0000 (14:32 -0700)]

am c70d483f: am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs

* commit 'c70d483f4baffe5cb4ba09df3645aa6a1b351431':
docs: fix the TOC in a few docs

commit | commitdiff | tree

Scott Main [Tue, 5 Apr 2011 21:28:23 +0000 (14:28 -0700)]

am e4cafabb: am a90eb8fe: docs: fix the TOC in a few docs

* commit 'e4cafabbcc4b69479217d1a167926b79c37e5ded':
docs: fix the TOC in a few docs

commit | commitdiff | tree

Scott Main [Tue, 5 Apr 2011 21:21:36 +0000 (14:21 -0700)]

am a90eb8fe: docs: fix the TOC in a few docs

* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff':
docs: fix the TOC in a few docs

commit | commitdiff | tree

Adam Powell [Tue, 5 Apr 2011 18:27:23 +0000 (11:27 -0700)]

am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1

* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
Fix bug 4207704 - Gestures can be lost when Flash is enabled

commit | commitdiff | tree

Adam Powell [Tue, 5 Apr 2011 18:14:27 +0000 (11:14 -0700)]

am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1

* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
Fix bug 4207704 - Gestures can be lost when Flash is enabled

commit | commitdiff | tree

Adam Powell [Tue, 5 Apr 2011 17:45:25 +0000 (10:45 -0700)]

Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1

commit | commitdiff | tree

Eric Laurent [Tue, 5 Apr 2011 00:44:50 +0000 (17:44 -0700)]

am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread

* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
Issue 4157048: mic gain for VoIP/SIP calls.

commit | commitdiff | tree

Mike Lockwood [Tue, 5 Apr 2011 00:44:46 +0000 (17:44 -0700)]

am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread

* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust

commit | commitdiff | tree

Trevor Johns [Tue, 5 Apr 2011 00:44:42 +0000 (17:44 -0700)]

am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread

* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
Fixing line in Market IAB docs that explains how to bind to the MarketService.

commit | commitdiff | tree

Simon Wilson [Tue, 5 Apr 2011 00:44:38 +0000 (17:44 -0700)]

am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread

* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off

commit | commitdiff | tree

Bill Gruber [Tue, 5 Apr 2011 00:35:34 +0000 (17:35 -0700)]

am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb

* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
SDK doc updates

commit | commitdiff | tree

Bill Gruber [Tue, 5 Apr 2011 00:31:23 +0000 (17:31 -0700)]

am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb

* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
SDK doc updates

commit | commitdiff | tree

Bill Gruber [Tue, 5 Apr 2011 00:21:25 +0000 (17:21 -0700)]

am d36bc32e: Merge "SDK doc updates" into honeycomb

* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
SDK doc updates

commit | commitdiff | tree

Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]

Merge "SDK doc updates" into honeycomb

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 23:43:48 +0000 (16:43 -0700)]

am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread

* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jason parks [Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)]

am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread

* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
Send out a broadcast that the system is being factory reset.

commit | commitdiff | tree

Justin Ho [Mon, 4 Apr 2011 23:43:23 +0000 (16:43 -0700)]

am 0f5e36de: am 87805ca3: Updated CDMA roaming icons

* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
Updated CDMA roaming icons

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 4 Apr 2011 23:43:15 +0000 (16:43 -0700)]

am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread

* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':

commit | commitdiff | tree

Robert Greenwalt [Mon, 4 Apr 2011 23:26:42 +0000 (16:26 -0700)]

resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp

Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf

commit | commitdiff | tree

Robert Greenwalt [Mon, 4 Apr 2011 22:25:45 +0000 (15:25 -0700)]

am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
Fix Default route after secondary net use.

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 22:25:39 +0000 (15:25 -0700)]

am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket"

* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
Fix data corruption when writing to Bluetooth socket

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 22:25:33 +0000 (15:25 -0700)]

am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"

* commit '9b1b64399502af0a08beac3014f2294644753602':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()