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 |
|
Gloria Wang
|
986ba2c02a
|
Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059."
|
2011-05-19 11:15:16 -07:00 |
|
Joe Fernandez
|
b9091dd2c2
|
am 0a36cec6: am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '0a36cec642fb58e295d0608026890d95d0ae3cc0':
docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
|
2011-05-19 11:13:41 -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 |
|
Mike Lockwood
|
9979ca5833
|
Merge "resolved conflicts for merge of c1730dcf to master"
|
2011-05-19 10:52:43 -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
|
893ace604d
|
resolved conflicts for merge of c1730dcf to master
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
|
2011-05-19 13:34:44 -04: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
|
02aad4811a
|
am c8f045b8: (-s ours) am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit 'c8f045b8a4cc83bc40ee999cb03a446f986d445c':
DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
|
2011-05-19 08:58:42 -07:00 |
|
Xavier Ducrohet
|
85f059a82d
|
am a13462a9: am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'a13462a947e634a6893119146a7271369e509586':
LayoutLib: support the new baseline/margin query API.
|
2011-05-19 08:58:18 -07:00 |
|
James Dong
|
aeae5d43c8
|
resolved conflicts for merge of a8939e0d to master
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
|
2011-05-19 08:49:09 -07:00 |
|
Jean-Baptiste Queru
|
8021fd3bcc
|
Merge c41aefe1
Change-Id: I70fc4382f832d1a2bded8a5ee7d9b96fac77879b
|
2011-05-19 07:54:53 -07:00 |
|
Jean-Baptiste Queru
|
d2478c73a5
|
Merge 111d17ce
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
|
2011-05-19 07:17:00 -07:00 |
|
Dianne Hackborn
|
e67a889693
|
am ba8fc5b0: am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit 'ba8fc5b059228402afa965e175d5f6655e3fe555':
Fix fake display size when rotated.
|
2011-05-19 03:46:24 -07:00 |
|
Jean-Baptiste Queru
|
63fb4c2881
|
am a49b2dbd: am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit 'a49b2dbdde52e20b6d590b35e209033229f5d82d':
MOTOYA changed two kinds of Japanese font files.
|
2011-05-19 03:44:45 -07:00 |
|
Gloria Wang
|
11b95c60f0
|
am 8d161fe1: (-s ours) am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '8d161fe1eafe80e01d84d2be55ae47314f944721':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
|
2011-05-19 03:44:31 -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 |
|
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 |
|