Daniel Sandler
de802a7c0e
Merge "Consolidate notification layouts by removing xlarge versions."
2011-05-05 17:07:59 -07:00
Wink Saville
c8a69ccfb7
am 3bebae43: am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
...
* commit '3bebae4332144004db9f774bfde1abcd6c656b2c':
Add Delay for data connection retry.
2011-05-05 16:24:58 -07:00
Wink Saville
5062062dfc
am 0b45723f: am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
...
* commit '0b45723f80ecb6038b15d791650d46f60f70f45f':
DataConnection: Fix handling of PDP setup failure.
2011-05-05 16:24:55 -07:00
Wink Saville
326f2a90e1
am d237d05c: Merge "Add Delay for data connection retry." into honeycomb-LTE
...
* commit 'd237d05c6f36d4e514eac95a9bcc07106c3d97eb':
Add Delay for data connection retry.
2011-05-05 16:22:31 -07:00
Wink Saville
c63340f955
am 8bc60413: Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
...
* commit '8bc60413b9840c7fa724e52f1271936640e97736':
DataConnection: Fix handling of PDP setup failure.
2011-05-05 16:22:29 -07:00
Wink Saville
2e170d7619
Merge "Add Delay for data connection retry." into honeycomb-LTE
2011-05-05 16:20:11 -07:00
Wink Saville
2923ef40e7
Merge "DataConnection: Fix handling of PDP setup failure." into honeycomb-LTE
2011-05-05 16:20:02 -07:00
Bill Gruber
b78787ae6f
am 821ec8ed: am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
...
* commit '821ec8edeee7d59396cbee3a370e5cf3d6c7b8b6':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
2011-05-05 16:13:03 -07:00
Bill Gruber
d53f647123
am 48f472f7: am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
...
* commit '48f472f748e9404bdb93a93f20a530794f6cdc2f':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
2011-05-05 16:09:42 -07:00
Bill Gruber
7a9c37cfcb
am 0369cf98: Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
...
* commit '0369cf98743e72d052eb5542125f58d1ad2f7f61':
Cherry pick from Honeycomb Change ID I8d57d12828afab700d76f9b19195817a0adfe080 IAB docs: adds best practices for pending transaction UI
2011-05-05 16:05:41 -07:00
Andreas Huber
554e591c48
Merge "Color conversion now supports YUV420p->RGB565 conversion even if the width is odd."
2011-05-05 15:51:25 -07:00
Scott Main
52213f75e1
am cda9fda4: am 4c8fa6d1: am 1c71fffe: update platform version number for docs
...
* commit 'cda9fda4fdeac3c3ce24df27e1c24c72d5b70960':
update platform version number for docs
2011-05-05 15:27:30 -07:00
James Dong
232e95975d
Merge "Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI"
2011-05-05 15:24:45 -07:00
Scott Main
444b3ce725
am 4c8fa6d1: am 1c71fffe: update platform version number for docs
...
* commit '4c8fa6d13500a7921601e098b47e2eb34aa18024':
update platform version number for docs
2011-05-05 15:24:12 -07:00
Scott Main
c46246ad8d
am 1c71fffe: update platform version number for docs
...
* commit '1c71fffeb5d6a241ccbe7f035ce0d030eaeef562':
update platform version number for docs
2011-05-05 15:18:19 -07:00
Patrick Dubroy
da33297a5a
Merge "Only delay pressed feedback for Views inside a scrolling parent"
2011-05-05 14:59:35 -07:00
James Dong
0c5a18ee32
Merge "Clean up JNI code"
2011-05-05 12:49:37 -07:00
Gilles Debunne
7135c39726
Merge "Off by one bug in TextView's suggestions popup."
2011-05-05 10:08:59 -07:00
Alex Sakhartchouk
935c0a22d8
Merge "Code Cleanup and better Sampler creation method"
2011-05-05 09:38:00 -07:00
Alex Sakhartchouk
33a033c5af
Merge "save benchmark results"
2011-05-05 09:37:07 -07:00
Scott Main
9251c6c054
am 4f034f70: am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
...
* commit '4f034f70d473c8c737977898f18d54caccf99a17':
docs: update homepage to announce 3.1
2011-05-05 09:02:35 -07:00
Scott Main
b0a692bf9c
am 475917c7: am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
...
* commit '475917c7e4002c42cdf668eabc1a04f604a82005':
docs: update homepage to announce 3.1
2011-05-05 08:54:07 -07:00
Scott Main
52018543db
am e6746acd: Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
...
* commit 'e6746acde2a0cc4faad9bdec026a9554797e2f94':
docs: update homepage to announce 3.1
2011-05-05 08:43:42 -07:00
Scott Main
d96c4779be
Merge "docs: update homepage to announce 3.1" into honeycomb-mr1
2011-05-05 08:33:03 -07:00
Steve Block
f4f6b3e0f1
Merge "Log an error message if WebView methods are called on the wrong thread."
2011-05-05 04:36:27 -07:00
Irfan Sheriff
0be3ac9385
am 86654eda: am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
...
* commit '86654eda96b005ea21bfe4d29cd042187e497a8f':
Handle GET_POWER failures
2011-05-04 21:22:29 -07:00
Irfan Sheriff
fd69d2efe2
am 8a14d8b9: am 1a5b6098: Handle GET_POWER failures
...
* commit '8a14d8b9c03c611cabde5743cfdcc9ff51314550':
Handle GET_POWER failures
2011-05-04 21:19:19 -07:00
Irfan Sheriff
02683c0f5a
am 1a5b6098: Handle GET_POWER failures
...
* commit '1a5b6098d5002ae07ce3f9bc514400a87c2b64fa':
Handle GET_POWER failures
2011-05-04 21:14:47 -07:00
Joe Onorato
f471b1ea7b
Merge "Fix race conditions in WakeLocks."
2011-05-04 18:13:10 -07:00
Irfan Sheriff
4145b8846d
Merge "Add basic walled garden check"
2011-05-04 17:58:04 -07:00
Jeff Sharkey
b11b5a7438
Merge "Return NetworkStats bundle from NM service."
2011-05-04 17:49:01 -07:00
Chet Haase
6cebed79c3
Merge "Add ability for hierarchyviewer to output displaylist info"
2011-05-04 17:30:30 -07:00
Wink Saville
1001a6b452
am ece6eb56: am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit 'ece6eb5625ac8b597f60d67f30f431ea13f237a5':
Fix 4379712 NPE in GsmDataConnectionTracker
2011-05-04 17:06:46 -07:00
Robert Ly
97cb331437
am 796ba68b: am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '796ba68b73fa93ae290cf85b264183ffcfa45eba':
doc change: a misplaced link removed
2011-05-04 17:04:50 -07:00
Wink Saville
2165117a3d
am 676db0d3: Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
...
* commit '676db0d301caf4fa64c2c1b8427fe2efd5cc7811':
Fix 4379712 NPE in GsmDataConnectionTracker
2011-05-04 17:04:19 -07:00
Robert Ly
58676c346a
am 2246bc66: am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '2246bc665d09e8f8e1dc35702fbe76e8bb270d56':
doc change: a misplaced link removed
2011-05-04 17:02:26 -07:00
Wink Saville
d686f61b81
Merge "Fix 4379712 NPE in GsmDataConnectionTracker" into honeycomb-LTE
2011-05-04 17:01:32 -07:00
Robert Ly
a453ab1f14
am 7157b7c3: Merge "doc change: a misplaced link removed" into honeycomb-mr1
...
* commit '7157b7c31462e9340847d15d936bbb0b1117ecbb':
doc change: a misplaced link removed
2011-05-04 17:00:10 -07:00
Robert Greenwalt
8f6e1e35ba
am 5673c13b: am aacd80fd: Fix build break.
...
* commit '5673c13b51bc4719d9a1afceb1aeb4743e86e230':
Fix build break.
2011-05-04 16:59:47 -07:00
Robert Ly
f59ce60a64
Merge "doc change: a misplaced link removed" into honeycomb-mr1
2011-05-04 16:55:59 -07:00
Robert Greenwalt
21d8a47de3
am aacd80fd: Fix build break.
...
* commit 'aacd80fd87bc08c410853a044967c8f7b417f089':
Fix build break.
2011-05-04 16:55:26 -07:00
Katie McCormick
842c02476d
am cfb91777: am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit 'cfb917770a063174dc188c28200d31c206e0bbfc':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:51:53 -07:00
Katie McCormick
2db814b2a1
am 7d513652: am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit '7d513652380ec4e1760e1f253d3630e4fdeb0ee5':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:49:17 -07:00
Katie McCormick
d2c0f942d5
am 62922c36: Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
...
* commit '62922c361e0c1b36c3787d7f06d04c3a609c2b12':
Cherry pick from honeycomb. Change-Id: I542fc39ef017346694cd0b376421bfec03ebe340
2011-05-04 15:47:10 -07:00
Joe Onorato
2705593910
Merge "If there is no hdmi available, still record that hdmi is not plugged in."
2011-05-04 15:29:15 -07:00
Scott Main
ac04ed0f00
am bcac77ec: am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'bcac77ec5c86dda8bacf3ab7c2c5a5597bf6cbd2':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:23:31 -07:00
Scott Main
21cd518a36
am f9e9452c: am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'f9e9452c2d6482a8181f6edb32f5c53bff10aa59':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:20:03 -07:00
Scott Main
fd5101dc6a
am ad3b87aa: cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
...
* commit 'ad3b87aa0d094c3e867ce44ec3f61e0b02090417':
cherrypick from honeycomb cl 742100b0ff66bb2a6fec706931e9cfeee8035ad3 docs: update dashboard for platform versions
2011-05-04 15:09:53 -07:00
Joe Onorato
f05c17a832
Merge "Rename ViewRoot to ViewAncestor."
2011-05-04 14:52:37 -07:00
Scott Main
d4b483d5bc
am e9091efe: am bb4ffd45: am 41703766: docs: typo in menu doc
...
* commit 'e9091efe44f75795fdbad46ef9393d886de806d9':
docs: typo in menu doc
2011-05-04 14:48:10 -07:00