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

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

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

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

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()

commit | commitdiff | tree

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

am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container"

* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
Avoid crash in system server when mounting container

commit | commitdiff | tree

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

Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp

commit | commitdiff | tree

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

resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp

Change-Id: Ide9ed301618b89a1cced4885062c13047980890c

commit | commitdiff | tree

Roman Nurik [Mon, 4 Apr 2011 20:47:34 +0000 (13:47 -0700)]

am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1

* commit '9131557721afc93626f0fcbbe6e485a0c863cc87':
Document support for .TS video containers.

commit | commitdiff | tree

Roman Nurik [Mon, 4 Apr 2011 20:44:23 +0000 (13:44 -0700)]

am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1

* commit '5a41a8a0fda21d5332f1355832550fcfffbb9975':
Document support for .TS video containers.

commit | commitdiff | tree

Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]

Merge "Document support for .TS video containers." into honeycomb-mr1

commit | commitdiff | tree

Eric Laurent [Mon, 4 Apr 2011 19:25:37 +0000 (12:25 -0700)]

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

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

commit | commitdiff | tree

Mike Lockwood [Mon, 4 Apr 2011 19:25:33 +0000 (12:25 -0700)]

am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread

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

commit | commitdiff | tree

Trevor Johns [Mon, 4 Apr 2011 19:25:29 +0000 (12:25 -0700)]

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

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

commit | commitdiff | tree

Simon Wilson [Mon, 4 Apr 2011 19:25:25 +0000 (12:25 -0700)]

am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread

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

commit | commitdiff | tree

Eric Fischer [Mon, 4 Apr 2011 19:20:38 +0000 (12:20 -0700)]

am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread

* commit '8b312c6ca1c3f6dc4bec0c7d45bc9509afef4984':
Import revised translations. DO NOT MERGE

commit | commitdiff | tree

Jason parks [Mon, 4 Apr 2011 19:20:33 +0000 (12:20 -0700)]

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

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

commit | commitdiff | tree

Justin Ho [Mon, 4 Apr 2011 19:19:39 +0000 (12:19 -0700)]

am 87805ca3: Updated CDMA roaming icons

* commit '87805ca3a477e165891baa18efe5239a70d11bc9':
Updated CDMA roaming icons

commit | commitdiff | tree

Jean-Baptiste Queru [Mon, 4 Apr 2011 19:19:26 +0000 (12:19 -0700)]

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

* commit 'bef31431cafe100e382a3caf7ea7dce343832d68':

commit | commitdiff | tree

Robert Greenwalt [Mon, 4 Apr 2011 19:18:58 +0000 (12:18 -0700)]

am 27725e8c: Only leave one default network up at a time.

* commit '27725e8cd1e2eb3b88186ae8d43e437f130b1f84':
Only leave one default network up at a time.

commit | commitdiff | tree

Robert Ly [Mon, 4 Apr 2011 18:48:51 +0000 (11:48 -0700)]

am 6f7e4cb5: am 3f39f653: Adding package description for android.hardware.usb

* commit '6f7e4cb5ae58f5eff6bb4216439c47fd13202b09':
Adding package description for android.hardware.usb

commit | commitdiff | tree

Robert Ly [Mon, 4 Apr 2011 18:41:02 +0000 (11:41 -0700)]

am 3f39f653: Adding package description for android.hardware.usb

* commit '3f39f653a90f9727d13be1e9908f0afb8fe66d6e':
Adding package description for android.hardware.usb

commit | commitdiff | tree

Robert Greenwalt [Mon, 4 Apr 2011 18:23:51 +0000 (11:23 -0700)]

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

commit | commitdiff | tree

Robert Greenwalt [Mon, 4 Apr 2011 18:21:23 +0000 (11:21 -0700)]

resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp

Change-Id: I28cf91f473eb9e3e758129b2f4d89827e73049dd

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 18:03:03 +0000 (11:03 -0700)]

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

* commit '9907d161584415c81de1099678f160da172fd1a6':
Fix data corruption when writing to Bluetooth socket

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 17:49:05 +0000 (10:49 -0700)]

Merge "Fix data corruption when writing to Bluetooth socket"

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:43 +0000 (10:17 -0700)]

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

* commit '2ed72048828cf9f617da971e5d2b8a062de08e5b':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 17:17:35 +0000 (10:17 -0700)]

am e558a000: Merge "Avoid crash in system server when mounting container"

* commit 'e558a0000389a2523b8d3d3a787db6b4579d2bdc':
Avoid crash in system server when mounting container

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 16:41:10 +0000 (09:41 -0700)]

Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"

commit | commitdiff | tree

Brad Fitzpatrick [Mon, 4 Apr 2011 16:38:16 +0000 (09:38 -0700)]

Merge "Avoid crash in system server when mounting container"

commit | commitdiff | tree

Dirk Dougherty [Sun, 3 Apr 2011 21:06:00 +0000 (14:06 -0700)]

am 826af857: am f9cdf7fe: Doc change: add diff report for API 12.

* commit '826af8576b27d18997440bec75daa26434033c0c':
Doc change: add diff report for API 12.

commit | commitdiff | tree

Dirk Dougherty [Sun, 3 Apr 2011 21:04:20 +0000 (14:04 -0700)]

am f9cdf7fe: Doc change: add diff report for API 12.

* commit 'f9cdf7feb47aa142e11862f5694c0a29ac013a51':
Doc change: add diff report for API 12.

commit | commitdiff | tree

Dirk Dougherty [Sun, 3 Apr 2011 20:56:07 +0000 (13:56 -0700)]

am 85709ac8: am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1

* commit '85709ac8e3340fb8114cfff7128a09d64c06cdc1':
Doc change: update media formats tables with adts/aac and flac

commit | commitdiff | tree

Dirk Dougherty [Sun, 3 Apr 2011 20:50:48 +0000 (13:50 -0700)]

am 16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1

* commit '1676920113d35b66e6e8846ffb7dded7e011c2fa':
Doc change: update media formats tables with adts/aac and flac

commit | commitdiff | tree

Dirk Dougherty [Sun, 3 Apr 2011 20:40:48 +0000 (13:40 -0700)]

Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1

commit | commitdiff | tree

Scott Main [Sat, 2 Apr 2011 00:43:12 +0000 (17:43 -0700)]

am 342d8fdb: am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb

* commit '342d8fdbb6ee256da90ada3e48e198bbc9e8d8e3':
docs: update device dashboard

commit | commitdiff | tree

Scott Main [Sat, 2 Apr 2011 00:41:40 +0000 (17:41 -0700)]

am 90a1befa: am 27690eba: Merge "docs: update device dashboard" into honeycomb

* commit '90a1befa551a9e6dc8f06b7331e26e6470ab824f':
docs: update device dashboard

commit | commitdiff | tree

Scott Main [Sat, 2 Apr 2011 00:39:05 +0000 (17:39 -0700)]

am 27690eba: Merge "docs: update device dashboard" into honeycomb

* commit '27690ebabc915091956f0331023c9d074177271d':
docs: update device dashboard

commit | commitdiff | tree

Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]

Merge "docs: update device dashboard" into honeycomb

commit | commitdiff | tree

Wink Saville [Fri, 1 Apr 2011 23:36:25 +0000 (16:36 -0700)]

am 0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE

* commit '0b8e313c7f97f9cb34e2ba555182621889b69a16':
Data Retry fix after failure due to permanent causes.

commit | commitdiff | tree

Wink Saville [Fri, 1 Apr 2011 23:34:51 +0000 (16:34 -0700)]

Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE

commit | commitdiff | tree

Scott Main [Fri, 1 Apr 2011 23:25:14 +0000 (16:25 -0700)]

am 0fa1d66c: am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb

* commit '0fa1d66cccc6041bcc55cf39e77970edbe89109f':
docs: update homepage announcement for Google IO

commit | commitdiff | tree

Scott Main [Fri, 1 Apr 2011 23:22:35 +0000 (16:22 -0700)]

am 6261861a: am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb

* commit '6261861a94448e4fbc26e313ce1410a184a10914':
docs: update homepage announcement for Google IO

commit | commitdiff | tree

Scott Main [Fri, 1 Apr 2011 23:19:30 +0000 (16:19 -0700)]

am cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb

* commit 'cb719a48a2f2e9bc47b317f75ebb8320f6ce877c':
docs: update homepage announcement for Google IO

commit | commitdiff | tree

Scott Main [Fri, 1 Apr 2011 23:17:40 +0000 (16:17 -0700)]

Merge "docs: update homepage announcement for Google IO" into honeycomb

commit | commitdiff | tree

Mike Lockwood [Fri, 1 Apr 2011 18:37:05 +0000 (11:37 -0700)]

am 38f04c0f: am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.

* commit '38f04c0f28fc59bc7e893ca6a1ffc4d0745ab8c2':
Improve Javadoc for USB Manager and MTP/PTP support.

commit | commitdiff | tree

Mike Lockwood [Fri, 1 Apr 2011 18:34:39 +0000 (11:34 -0700)]

am 11dd5ae9: Improve Javadoc for USB Manager and MTP/PTP support.

* commit '11dd5ae97b1cd5889bb66862fd12718da62a9c75':
Improve Javadoc for USB Manager and MTP/PTP support.

commit | commitdiff | tree

Wink Saville [Fri, 1 Apr 2011 17:32:37 +0000 (10:32 -0700)]

am dacb8090: Merge "Airplane mode on always timed out when camping on LTE" into honeycomb-LTE

* commit 'dacb80901dfbd7cc18a6f1ede6ca334ed42c038f':
Airplane mode on always timed out when camping on LTE