Kenny Root
f9fa770f38
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp
2011-05-19 12:48:41 -07:00
Kenny Root
77123ca552
resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp
...
Change-Id: I3385f57e5761679e6700bcbe3c41deb3ecd43ba1
2011-05-19 12:48:14 -07:00
Wink Saville
2a88c9e891
am ab5baa1d: Merge "Reset connection while data state changed." into honeycomb-LTE
...
* commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736':
Reset connection while data state changed.
2011-05-19 11:28:36 -07:00
Wink Saville
fe0380f2e6
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Joe Fernandez
46be04f085
am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit '605be31c4a80e03dc0af76a73aaa33316ca4a635':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 11:06:04 -07:00
Kenny Root
e5c511391b
am f2006f31: Merge "Break apart queries to getInstalled* API" into gingerbread
...
* commit 'f2006f3123dcdf598e052051041b49c89710b53e':
Break apart queries to getInstalled* API
2011-05-19 11:04:01 -07:00
Joe Fernandez
ecaf66a1b9
am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:59:16 -07:00
Kenny Root
46eb8c2d2d
Merge "Break apart queries to getInstalled* API" into gingerbread
2011-05-19 10:55:00 -07:00
Joe Fernandez
10f5d9880b
am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
...
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:53:04 -07:00
Joe Fernandez
5986a9eb56
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
2011-05-19 10:49:45 -07:00
Mike Lockwood
069efd877f
am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
USB: Add method to access raw USB device descriptors
2011-05-19 10:06:44 -07:00
Mike Lockwood
ff0662ead6
am a88b42d5: USB: Add method to access raw USB device descriptors
...
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
USB: Add method to access raw USB device descriptors
2011-05-19 10:01:53 -07:00
Adam Powell
62de6cdcb8
am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
...
* commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
2011-05-18 19:16:31 -07:00
Adam Powell
c14243ec52
am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
...
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
2011-05-18 19:14:44 -07:00
Adam Powell
ff661a6e78
Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
2011-05-18 19:13:22 -07:00
Xavier Ducrohet
d8dcaa4050
am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
...
* commit '582841e734bc85b247df64ac85b6ee09f7375f44':
LayoutLib: support the new baseline/margin query API.
2011-05-18 17:51:31 -07:00
Xavier Ducrohet
c1a72346bb
am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
...
* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
LayoutLib: support the new baseline/margin query API.
2011-05-18 17:43:27 -07:00
Xavier Ducrohet
04a238006c
am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
...
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
LayoutLib: support the new baseline/margin query API.
2011-05-18 17:40:08 -07:00
Xavier Ducrohet
8b836da477
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
2011-05-18 17:36:16 -07:00
James Dong
e92dd5702b
am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
...
* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
Using widevine:// to stream adaptive bitrate wvm content no longer
2011-05-18 16:33:20 -07:00
Robert Greenwalt
65ad797f13
am 59b1a4ed: Switch to use netd to add/remove routes.
...
* commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743':
Switch to use netd to add/remove routes.
2011-05-18 16:33:16 -07:00
James Dong
ebc9266940
am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
...
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
2011-05-18 16:09:58 -07:00
James Dong
502019a5df
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Jean-Baptiste Queru
59cb770434
Merge 4b999030
...
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
2011-05-18 15:33:27 -07:00
Jean-Baptiste Queru
99d8ed3c30
am 6c427617: Merge "support humidity sensor type"
...
* commit '6c427617be940be32fdebbd9c78f9223b292c814':
support humidity sensor type
2011-05-18 15:20:29 -07:00
Dianne Hackborn
7aad6034e7
am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
...
* commit '8416e5cf0a8439a3f605629068d3639f2a35e08b':
Fix fake display size when rotated.
2011-05-18 15:16:05 -07:00
Dianne Hackborn
65cec3f349
am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
...
* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
Fix fake display size when rotated.
2011-05-18 15:12:07 -07:00
Dianne Hackborn
9a11c3710a
Merge "Fix fake display size when rotated." into honeycomb-mr2
2011-05-18 15:09:58 -07:00
Jean-Baptiste Queru
14402a1a5a
Merge "support humidity sensor type"
2011-05-18 15:00:11 -07:00
Jean-Baptiste Queru
762ed0e482
am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
...
* commit 'a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.
2011-05-18 09:52:18 -07:00
Jean-Baptiste Queru
4664d07374
am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
...
* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
MOTOYA changed two kinds of Japanese font files.
2011-05-18 09:46:16 -07:00
Gloria Wang
f066f6cffe
am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:30:01 -07:00
Jean-Baptiste Queru
af859fa9ae
Merge "MOTOYA changed two kinds of Japanese font files."
2011-05-18 09:24:40 -07:00
Gloria Wang
0ec18622dd
am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:19:56 -07:00
Gloria Wang
4bee0c6039
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Kazuhiro Ondo
0aa7b10467
am 01758e81: Linkproperties update via unsol data call state change.
...
* commit '01758e81b3ad89934581885bb2fc7006510ec639':
Linkproperties update via unsol data call state change.
2011-05-18 00:02:31 -07:00
Wink Saville
05b1d174a6
am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
...
* commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47':
Remove SIM operator name hack
2011-05-17 20:38:05 -07:00
Wink Saville
5e5c8507a6
Merge "Remove SIM operator name hack" into honeycomb-LTE
2011-05-17 20:35:35 -07:00
Adam Powell
2463c1bbff
am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:28:06 -07:00
Adam Powell
9187214d41
am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
...
* commit '30a76196c8f426b530a80166817d3280acb2b100':
Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:25:58 -07:00
Adam Powell
57d723dfaf
Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
2011-05-17 20:24:39 -07:00
Dianne Hackborn
82585bc313
am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'c2db21445ddd4327e949b38edcf1ab9fd18f94f0':
Improve compat mode scaling implementation.
2011-05-17 18:42:23 -07:00
Dianne Hackborn
c9ba3c8870
am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
Improve compat mode scaling implementation.
2011-05-17 18:40:12 -07:00
Dianne Hackborn
0265a6ba75
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
8c00064be1
am 16c69222: am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '16c692229d6ed3d0df8682884b35252ea72c7c26':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:34:49 -07:00
Adam Powell
8fe8db60fe
am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
...
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:32:06 -07:00
Adam Powell
39bbfc22a9
Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
2011-05-17 18:30:08 -07:00
Katie McCormick
b8fec16e1b
am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '32638ccb66d933512f4792d120b5cd93e9a26537':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:47:48 -07:00
Katie McCormick
a46e385cf1
am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:40:38 -07:00
Katie McCormick
cdb8f8f181
am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '566489dbf6047ce90f3765b4058723dbcd731b30':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:38:04 -07:00