Jim Miller
aee08c5383
Merge "First pass at integrating new ScrollView-based recents panel. - added layout transitions - now calls removeTask() for selected activity."
2011-05-18 17:49:32 -07:00
Kazuhiro Ondo
9869dab1dc
am b22a9fd9: am 01758e81: Linkproperties update via unsol data call state change.
...
* commit 'b22a9fd9bb32133cbc7dc4fc7752dbf68e52dffe':
Linkproperties update via unsol data call state change.
2011-05-18 17:48:37 -07:00
Wink Saville
4e98803a27
am e34a7686: am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTE
...
* commit 'e34a7686a36bf0f48cd9d20090b4b8df1bf0d1ce':
Remove SIM operator name hack
2011-05-18 17:47:49 -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
Adam Powell
600caa99a6
resolved conflicts for merge of 961f8bef to master
...
Change-Id: I9b437ddbebb10cf3ccf579b6b13e6c86bd73900c
2011-05-18 17:32:16 -07:00
Alex Sakhartchouk
e969cc08b3
Merge "Preparing libRS for for compilation on host."
2011-05-18 16:39:05 -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
Daniel Sandler
6cfe306a96
Merge "Turn off navbar for now."
2011-05-18 14:44:16 -07:00
Mathias Agopian
b27aabc09d
Merge "Disable error report temporarily to enable inline video"
2011-05-18 14:43:53 -07:00
Teng-Hui Zhu
d7e291fecd
Disable error report temporarily to enable inline video
...
bug:4435022
Change-Id: I06f05a4781ad432ab71db93f0815eb89cd2e7a69
2011-05-18 14:37:51 -07:00
Guang Zhu
8de3e4d25f
Merge "call clearCache from UI thread"
2011-05-18 14:21:29 -07:00
Fabrice Di Meglio
9d58118da5
Merge "Fix bug #4441002 Crash in SkPathEffectGlue::OneD_constructor"
2011-05-18 12:50:34 -07:00
Dianne Hackborn
a28d034e54
am 4f9bb17f: am c2db2144: am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
...
* commit '4f9bb17f7e74746c4296100f2fbd47f0f6ead3a7':
Improve compat mode scaling implementation.
2011-05-18 10:36:14 -07:00
Adam Powell
ec9ee068e5
resolved conflicts for merge of f61c3d07 to master
...
Change-Id: Id38b4ff3ccc677b2d9e743186473b3559b00119b
2011-05-18 10:33:20 -07:00
Katie McCormick
661609c43b
am 2c898da6: am 32638ccb: am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '2c898da6d3306e041da0165607555303203ec86d':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-18 10:25:02 -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
Andreas Huber
58fab0fb84
Merge "Properly forward rotation information from input format to output format."
2011-05-18 09:40:52 -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
Mike Lockwood
b516243262
am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
StorageVolume: Add getStorageId() accessor
2011-05-18 09:23:35 -07:00
John Reck
10db34a1bb
am c54d3a98: am 1818b4a9: am 1147bf63: Don\'t use mobile for large uastring
...
* commit 'c54d3a987235c615715e45f5a22ba75e6fae22b3':
Don't use mobile for large uastring
2011-05-18 09:23:22 -07:00
Eric Fischer
c2c0075aa3
am 49ac7418: (-s ours) am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
...
* commit '49ac741841224b9ff2579f6b7722dc7eb0ebcd3a':
Import revised translations. DO NOT MERGE
2011-05-18 09:21:13 -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
Eino-Ville Talvala
34526db89b
Merge "Add auto-white balance locking to the Camera API."
2011-05-18 08:54:40 -07:00
Mike Lockwood
f27b62fb90
resolved conflicts for merge of 22c140b7 to master
...
Change-Id: I1d57d76519d7a8d8ea7c5be4f49ef885f1ffb302
2011-05-18 09:25:49 -04: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
24139dd2b0
Merge "dumpstate: don't attempt to use vril-dump, it breaks adb bugreport"
2011-05-17 23:32:01 -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