OSDN Git Service
Mike LeBeau [Tue, 5 Apr 2011 21:03:55 +0000 (14:03 -0700)]
Merge "Add EXTRA_ORIGIN to RecognizerIntent."
Mike Lockwood [Tue, 5 Apr 2011 20:36:49 +0000 (13:36 -0700)]
Merge "MTP and media provider support for multiple storage devices:"
Kenny Root [Tue, 5 Apr 2011 20:17:02 +0000 (13:17 -0700)]
Merge "Update installd to allow multiuser"
Mike Lockwood [Tue, 5 Apr 2011 19:41:47 +0000 (12:41 -0700)]
Merge "MountService: Fix running media scanner at boot."
Mike Lockwood [Tue, 5 Apr 2011 19:41:35 +0000 (12:41 -0700)]
Merge "Fix deadlock in MountService"
Eric Laurent [Tue, 5 Apr 2011 19:23:28 +0000 (12:23 -0700)]
Merge "New fix for issue
4111672: control block flags"
Adam Powell [Tue, 5 Apr 2011 18:30:52 +0000 (11:30 -0700)]
am
2e68ec1b: am
2bb59637: am
030b38ff: Merge "Fix bug
4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1
* commit '
2e68ec1bc6e9ab57cd884d32b08dbb389189e7a4':
Fix bug
4207704 - Gestures can be lost when Flash is enabled
Mike LeBeau [Tue, 5 Apr 2011 18:27:55 +0000 (11:27 -0700)]
Merge "Support speech recognizer confidence values."
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
Eric Fischer [Tue, 5 Apr 2011 18:18:57 +0000 (11:18 -0700)]
Merge "Import revised translations."
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
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
Eric Laurent [Tue, 5 Apr 2011 17:27:06 +0000 (10:27 -0700)]
am
7a492a9a: am
b7a76e84: am
a482d83c: Merge "Issue
4157048: mic gain for VoIP/SIP calls." into gingerbread
* commit '
7a492a9ad42947a3a7b777b0eb6eec56f5bb942b':
Issue
4157048: mic gain for VoIP/SIP calls.
Mike Lockwood [Tue, 5 Apr 2011 17:27:03 +0000 (10:27 -0700)]
am
824c6edc: (-s ours) am
179122ad: (-s ours) am
a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread
* commit '
824c6edce8f79aac9c98caabd9b8857d4c580629':
DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
Trevor Johns [Tue, 5 Apr 2011 17:27:01 +0000 (10:27 -0700)]
am
fa6b7889: am
ea477d20: am
cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread
* commit '
fa6b78890b17f6df2175b143783174ab5e7f7758':
Fixing line in Market IAB docs that explains how to bind to the MarketService.
Simon Wilson [Tue, 5 Apr 2011 17:26:54 +0000 (10:26 -0700)]
am
442bf4cd: (-s ours) am
d7a8e845: (-s ours) am
ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread
* commit '
442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
DO NOT MERGE Disable WiMAX when "Data Enabled" is off
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.
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
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.
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
Christopher Tate [Tue, 5 Apr 2011 00:41:22 +0000 (17:41 -0700)]
Merge "Fix deadlock in BackupManagerService"
Mike Lockwood [Tue, 5 Apr 2011 00:39:21 +0000 (17:39 -0700)]
Merge "StorageManager: Add getVolumeList() and getVolumeState() methods"
Mike Lockwood [Tue, 5 Apr 2011 00:39:15 +0000 (17:39 -0700)]
Merge "MountService: Add support for multiple volumes"
Bill Gruber [Tue, 5 Apr 2011 00:37:46 +0000 (17:37 -0700)]
am
0ac3183c: am
f0d2c1c4: am
63ac0379: am
d36bc32e: Merge "SDK doc updates" into honeycomb
* commit '
0ac3183c6489120fa84df9e289b2db31fb49c842':
SDK doc updates
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
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
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
Bill Gruber [Tue, 5 Apr 2011 00:15:08 +0000 (17:15 -0700)]
Merge "SDK doc updates" into honeycomb
Eric Fischer [Mon, 4 Apr 2011 23:46:38 +0000 (16:46 -0700)]
am
2e715df8: (-s ours) am
d20023ae: (-s ours) am
8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
Import revised translations. DO NOT MERGE
Jason parks [Mon, 4 Apr 2011 23:46:34 +0000 (16:46 -0700)]
am
5ee250aa: am
1d733625: am
cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread
* commit '
5ee250aa744720c90b264966f9721cfb9d256e96':
Send out a broadcast that the system is being factory reset.
Justin Ho [Mon, 4 Apr 2011 23:46:31 +0000 (16:46 -0700)]
am
d95fa2ff: am
0f5e36de: am
87805ca3: Updated CDMA roaming icons
* commit '
d95fa2ff8cf7cc302dab5de0f1becf67bd298898':
Updated CDMA roaming icons
Jean-Baptiste Queru [Mon, 4 Apr 2011 23:46:29 +0000 (16:46 -0700)]
am
e2fbd0a9: am
0c61e105: am
bef31431: No-op - reconcile with open-source gingerbread
* commit '
e2fbd0a9b03956dbb7d787ed435b895cfc735780':
Robert Greenwalt [Mon, 4 Apr 2011 23:44:25 +0000 (16:44 -0700)]
am
e716a551: resolved conflicts for merge of
ab2194aa to honeycomb-plus-aosp
* commit '
e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
Only leave one default network up at a time.
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
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.
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
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':
Chet Haase [Mon, 4 Apr 2011 23:27:38 +0000 (16:27 -0700)]
Merge "Fix bug with values in cloned animators."
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
Robert Greenwalt [Mon, 4 Apr 2011 22:28:56 +0000 (15:28 -0700)]
am
da8beef5: am
37229514: Merge "resolved conflicts for merge of
7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp
* commit '
da8beef55612738d87d6aa520445377a9e4ae784':
Fix Default route after secondary net use.
Brad Fitzpatrick [Mon, 4 Apr 2011 22:28:54 +0000 (15:28 -0700)]
am
5851b866: am
27e00544: am
9907d161: Merge "Fix data corruption when writing to Bluetooth socket"
* commit '
5851b8662dc95372d68df293cb13c59da0cf8582':
Fix data corruption when writing to Bluetooth socket
Brad Fitzpatrick [Mon, 4 Apr 2011 22:28:51 +0000 (15:28 -0700)]
am
e511fb33: am
9b1b6439: am
2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
* commit '
e511fb33d33f0ba83ce437f615fa236f369b5ade':
Always return a valid index from Rfc822Tokenizer.findTokenEnd()
Brad Fitzpatrick [Mon, 4 Apr 2011 22:28:48 +0000 (15:28 -0700)]
am
8f7aad14: am
f7a34b15: am
e558a000: Merge "Avoid crash in system server when mounting container"
* commit '
8f7aad147d790b25bae7301827e070df72690341':
Avoid crash in system server when mounting container
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.
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
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()
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
Robert Greenwalt [Mon, 4 Apr 2011 22:12:13 +0000 (15:12 -0700)]
am
549177e4: Merge "resolved conflicts for merge of
92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp
* commit '
549177e4f3f5e2a92e1431c157cebb985068a5ee':
Fix bad merge.
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
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
Alex Sakhartchouk [Mon, 4 Apr 2011 21:33:19 +0000 (14:33 -0700)]
Merge "First draft of fbo in renderscript. Updating samples and benchmark"
Gilles Debunne [Mon, 4 Apr 2011 21:25:45 +0000 (14:25 -0700)]
Merge "IME is no longer shown when an EditText gets focus."
Roman Nurik [Mon, 4 Apr 2011 20:51:18 +0000 (13:51 -0700)]
am
84967294: am
91315577: am
5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1
* commit '
84967294f25d223ff2c5e62378b40f20fd853c4c':
Document support for .TS video containers.
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.
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.
Roman Nurik [Mon, 4 Apr 2011 20:41:11 +0000 (13:41 -0700)]
Merge "Document support for .TS video containers." into honeycomb-mr1
Elliott Hughes [Mon, 4 Apr 2011 19:55:58 +0000 (12:55 -0700)]
Merge "You can't fsync(2) /dev/urandom..."
Andreas Huber [Mon, 4 Apr 2011 19:45:23 +0000 (12:45 -0700)]
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.
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
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.
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
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
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.
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
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':
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.
Adam Cohen [Mon, 4 Apr 2011 19:12:25 +0000 (12:12 -0700)]
Merge "Fixing build"
Andreas Huber [Mon, 4 Apr 2011 19:00:20 +0000 (12:00 -0700)]
Merge "Avoid a race condition while signaling audio EOS/seek complete by acquiring the lock."
Robert Ly [Mon, 4 Apr 2011 18:55:23 +0000 (11:55 -0700)]
am
cbfeda13: am
6f7e4cb5: am
3f39f653: Adding package description for android.hardware.usb
* commit '
cbfeda13e7da5c1cdf6f02e76d81ac5f878b1225':
Adding package description for android.hardware.usb
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
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
Adam Cohen [Mon, 4 Apr 2011 18:27:07 +0000 (11:27 -0700)]
Merge "Making StackView res-out and click feedback colors stylable"
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
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
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
Brad Fitzpatrick [Mon, 4 Apr 2011 17:49:05 +0000 (10:49 -0700)]
Merge "Fix data corruption when writing to Bluetooth socket"
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()
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
Brad Fitzpatrick [Mon, 4 Apr 2011 16:41:10 +0000 (09:41 -0700)]
Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()"
Brad Fitzpatrick [Mon, 4 Apr 2011 16:38:16 +0000 (09:38 -0700)]
Merge "Avoid crash in system server when mounting container"
Dirk Dougherty [Sun, 3 Apr 2011 21:07:49 +0000 (14:07 -0700)]
am
9e374cf4: am
826af857: am
f9cdf7fe: Doc change: add diff report for API 12.
* commit '
9e374cf4941c18059ce47b5eba9ace08d06f57b0':
Doc change: add diff report for API 12.
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.
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.
Dirk Dougherty [Sun, 3 Apr 2011 21:01:40 +0000 (14:01 -0700)]
am
b079c1f8: am
85709ac8: am
16769201: Merge "Doc change: update media formats tables with adts/aac and flac" into honeycomb-mr1
* commit '
b079c1f8ee41e714b5273189014a5601598a8b62':
Doc change: update media formats tables with adts/aac and flac
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
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
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
Brian Carlstrom [Sun, 3 Apr 2011 03:39:32 +0000 (20:39 -0700)]
Merge "Tracking merge of dalvik-dev to master"
Scott Main [Sat, 2 Apr 2011 00:45:41 +0000 (17:45 -0700)]
am
e1e46c72: am
342d8fdb: am
90a1befa: am
27690eba: Merge "docs: update device dashboard" into honeycomb
* commit '
e1e46c7263948f5127f618e905fe5fb3ec0b3437':
docs: update device dashboard
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
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
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
Scott Main [Sat, 2 Apr 2011 00:36:42 +0000 (17:36 -0700)]
Merge "docs: update device dashboard" into honeycomb
Wink Saville [Fri, 1 Apr 2011 23:38:43 +0000 (16:38 -0700)]
am
22cfcaee: am
0b8e313c: Merge "Data Retry fix after failure due to permanent causes." into honeycomb-LTE
* commit '
22cfcaee24829e52c636ca2f5df0285569c6e7c1':
Data Retry fix after failure due to permanent causes.
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.
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
Jeff Brown [Fri, 1 Apr 2011 23:33:40 +0000 (16:33 -0700)]
Merge "Fix dispatcher crash when input monitoring enabled. Also ensure that we actually log assertion failures."
Scott Main [Fri, 1 Apr 2011 23:27:19 +0000 (16:27 -0700)]
am
03d4dc3b: am
0fa1d66c: am
6261861a: am
cb719a48: Merge "docs: update homepage announcement for Google IO" into honeycomb
* commit '
03d4dc3b75c28ee3f502c983fcb8304d556db063':
docs: update homepage announcement for Google IO
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
OSDN Git Service
