Amith Yamasani
1ec44accb6
am 5b00912e: am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
...
* commit '5b00912e5844591a846e8ba3c4710d2daaa8069a':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:12:00 -07:00
Mike Lockwood
dd47c337e4
am d8d84708: am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit 'd8d8470825a637843d45a3b436e80a3b85f1dd11':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:09:30 -07:00
Amith Yamasani
e5d0e60776
am 51652f56: Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
...
* commit '51652f5674e266d62607324255517d41d225d9be':
DO NOT MERGE. Preference activity changes to work on smaller tablet screens.
2011-05-23 17:08:48 -07:00
Mike Lockwood
ba53d912df
am 988b6648: Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
...
* commit '988b6648b0138fe1294228e17164b2f1d6a4042d':
MountService: Add StorageVolume as extra in storage related broadcasts.
2011-05-23 17:06:47 -07:00
Amith Yamasani
793c8503d7
Merge "DO NOT MERGE. Preference activity changes to work on smaller tablet screens." into honeycomb-mr2
2011-05-23 17:05:47 -07:00
Mike Lockwood
147079acee
Merge "MountService: Add StorageVolume as extra in storage related broadcasts." into honeycomb-mr2
2011-05-23 17:04:01 -07:00
Dianne Hackborn
4068646b01
Merge "resolved conflicts for merge of 070a19e0 to master"
2011-05-23 16:59:20 -07:00
John Reck
57162780ea
am 82de141d: am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
...
* commit '82de141db736b95b0e388ff060e2d2535192d769':
DO NOT MERGE Use previous version if version is a codename
2011-05-23 16:53:28 -07:00
John Reck
a59f1573e0
am 4a74eb67: Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
...
* commit '4a74eb679917797bf77a20773e0c079f5cc808e4':
DO NOT MERGE Use previous version if version is a codename
2011-05-23 16:50:23 -07:00
John Reck
fe750a4010
Merge "DO NOT MERGE Use previous version if version is a codename" into honeycomb-mr2
2011-05-23 16:47:32 -07:00
Dianne Hackborn
2f118cd350
am 4bb78889: am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
...
* commit '4bb78889d04594c01a6af7f6d38c1764e9f575f9':
Add "television" mode.
2011-05-23 16:16:54 -07:00
Dianne Hackborn
14298e1c71
am 40277df7: Merge "Add "television" mode." into honeycomb-mr2
...
* commit '40277df7c33c0fc381eec589c768fe86de4b4404':
Add "television" mode.
2011-05-23 16:07:43 -07:00
Dianne Hackborn
ac3311f484
Merge "Add "television" mode." into honeycomb-mr2
2011-05-23 15:18:20 -07:00
Dianne Hackborn
a6b34ef26a
Add "television" mode.
...
Change-Id: Ida1fdb61b036a8b489dbeda196fb4bc82e651b2b
2011-05-23 15:11:08 -07:00
TK MUN
fafcebd0e2
am 59c87cb6: (-s ours) am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
...
* commit '59c87cb6074fe48dc0af20ef0082bdef0803dc45':
DO NOT MERGE SystemUI: update signal level when broadcast is received
2011-05-23 14:52:29 -07:00
TK MUN
c414a4660d
am 6f0394a3: DO NOT MERGE SystemUI: update signal level when broadcast is received
...
* commit '6f0394a3b4d6082c9cb01de4a220a3b082e1840a':
DO NOT MERGE SystemUI: update signal level when broadcast is received
2011-05-23 14:47:38 -07:00
Steve Block
8df959fe4f
Merge "Log a StrictMode violation when WebView methods are called on the wrong thread"
2011-05-23 14:34:00 -07:00
Dianne Hackborn
557e3dadda
resolved conflicts for merge of 070a19e0 to master
...
Change-Id: I855ab02a4e8dd465af67fd23b66c0dace76bd411
2011-05-23 14:10:26 -07:00
Wink Saville
15b729927a
am 070eecef: Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
...
* commit '070eecef394175d7344cdadde675e8977a1609f0':
Map multiple apnType to one DataConnection fixes.
2011-05-23 13:42:14 -07:00
Wink Saville
eaa8373e3a
am d3924fe9: Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
...
* commit 'd3924fe9f6c99bc92ed86195e07ba82d39043812':
Data Connection: Use Alarm for all delayed data retries.
2011-05-23 13:42:11 -07:00
Wink Saville
9e9b8e38a0
Merge "Map multiple apnType to one DataConnection fixes." into honeycomb-LTE
2011-05-23 13:39:03 -07:00
Wink Saville
2a2f80d6d6
Merge "Data Connection: Use Alarm for all delayed data retries." into honeycomb-LTE
2011-05-23 13:38:36 -07:00
Shimeng (Simon) Wang
2d941d9261
am de60ce66: am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
...
* commit 'de60ce66c117ebd224b9d3181e2184ec5cfe87f9':
Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:55:37 -07:00
Shimeng (Simon) Wang
45ae0d79ad
am 358d2cd9: Simplify browser pause/resume logic to avoid stuck timer.
...
* commit '358d2cd96403383cfb91bb68598a4cb2fe2e170e':
Simplify browser pause/resume logic to avoid stuck timer.
2011-05-23 12:14:04 -07:00
James Dong
65a38b6af4
am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 10:26:40 -07:00
Xavier Ducrohet
2bbb5c35c1
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 10:22:00 -07:00
Xavier Ducrohet
a81e01a111
am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit '041fd74beade4e95cff6157af9dadbf9a99b7fcf':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 10:21:57 -07:00
Xavier Ducrohet
8d54f983ba
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit '9d9a7466cd051748ba656acd39265099294c4153':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-23 10:21:49 -07:00
James Dong
9951acae07
am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 09:59:59 -07:00
Xavier Ducrohet
7e7703528c
am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge.
...
* commit '4c1e73b69a13a4f24a8fc123f599a9e9d8505525':
Merge e57aa434 from honeycomb-mr1. do not merge.
2011-05-23 09:52:55 -07:00
Xavier Ducrohet
03f2861cae
am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread
...
* commit 'f791863f0ac67ab6abd7410d5807d716cffc5b72':
Merge 05b7b69c from honeycomb-mr1. do not merge.
2011-05-23 09:52:52 -07:00
Xavier Ducrohet
fc445ebe8b
am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
...
* commit 'bb43828aa749e71d4e52ba69db01b83c83a755b5':
Merge 2fae858d from Honeycomb-mr1. do not merge.
2011-05-23 09:52:41 -07:00
Glenn Kasten
9271a58488
Merge "HAVE_ANDROID_OS AUDIOFLINGER_SECURITY_ENABLED dead"
2011-05-23 09:06:03 -07:00
Robert Greenwalt
4a74b0f478
am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
...
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
Simplfy getActive* calls in ConnectivityService
2011-05-21 21:35:38 -07:00
Jaikumar Ganesh
c5fb0536de
am 69ed0b62: am d1735ef9: am 4b41df61: Merge "Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board."
...
* commit '69ed0b628e18570f3fc7909fcdadc1e06f42e944':
Use proper type for oob variable in register_agent. Without this change the BluetoothEventLoop crashes on my armv5 arch board.
2011-05-21 21:35:22 -07:00
Jaikumar Ganesh
8033d1ed31
am e2271a55: am d7030e55: am 198ed3e4: Merge "BT: Wrong publishing result of bonding error code."
...
* commit 'e2271a55ad67f766a6a47239d1a3f7319a1e7b2e':
BT: Wrong publishing result of bonding error code.
2011-05-21 21:35:16 -07:00
Jim Miller
7748999e4c
am 940138de: am 0a734b18: am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
...
* commit '940138de9eae9be9ef60307af9e5f7a1168af533':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
2011-05-21 21:35:13 -07:00
Jim Miller
9b27385b8f
am 7d75e772: am ef2b2669: am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
...
* commit '7d75e772cbfe3f28451981f3e6b4d10f6a5ddc05':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
2011-05-21 21:34:56 -07:00
Kazuhiro Ondo
58f6c371d7
am f96a6150: Data reconnection issue after airplane mode
...
* commit 'f96a6150e4e6c37f8952456bf9f84714f622713d':
Data reconnection issue after airplane mode
2011-05-21 13:02:17 -07:00
Kazuhiro Ondo
a5c1bcded9
am 4c88be65: GSM DCT: Update poll stats to support multi-links
...
* commit '4c88be655e387011c6d57c6d68b5deb94f6ce601':
GSM DCT: Update poll stats to support multi-links
2011-05-21 12:50:18 -07:00
Wink Saville
137a7c0dee
am 15cd6ec2: Tear down connection with unwanted linkproperty change
...
* commit '15cd6ec250d22a093af3961ae1ec3cbbdd49d6b1':
Tear down connection with unwanted linkproperty change
2011-05-21 11:13:07 -07:00
Wink Saville
35a8281b9e
am 16e8d22b: Fix build.
...
* commit '16e8d22b206fb0c8b8b5a243ea13e08597f60ebc':
Fix build.
2011-05-20 23:37:28 -07:00
Fabrice Di Meglio
d80b48e43e
Merge "RTL Ordering of visual elements in LinearLayout"
2011-05-20 17:39:40 -07:00
Wink Saville
219bf8ff11
am 5f353de9: Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
...
* commit '5f353de96beca0a400796887e737314a62e35b6a':
Notify RIL that PDP reset is triggered due to data stall
2011-05-20 17:26:58 -07:00
Wink Saville
d4ff38f159
Merge "Notify RIL that PDP reset is triggered due to data stall" into honeycomb-LTE
2011-05-20 17:23:45 -07:00
John Wang
0f5bdaaa4d
am 393eb0d0: Merge "Add UI to handle SIM swap." into honeycomb-LTE
...
* commit '393eb0d06b4536591584a8d4c5fb03c2962835a9':
Add UI to handle SIM swap.
2011-05-20 17:22:50 -07:00
John Wang
647975b59c
Merge "Add UI to handle SIM swap." into honeycomb-LTE
2011-05-20 17:18:56 -07:00
Jim Miller
967672fd82
am 67cd389d: am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '67cd389d4b9b6fd3ea0df8af57f58816d8005a4b':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-20 16:56:51 -07:00
Jim Miller
89bbe8d827
am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-20 16:51:49 -07:00
Wink Saville
7fd53c7707
am 2b534e77: Merge "Fix broken data retry" into honeycomb-LTE
...
* commit '2b534e770dadc4b3180863a393fd89094d0f07a7':
Fix broken data retry
2011-05-20 16:51:29 -07:00