summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ab5baa1d: Merge "Reset connection while data state changed." into ↵Wink Saville2011-05-195-114/+112
|\ | | | | | | | | | | | | honeycomb-LTE * commit 'ab5baa1d5fbd433e4c391ea06d177aa6a6c1c736': Reset connection while data state changed.
| * Merge "Reset connection while data state changed." into honeycomb-LTEWink Saville2011-05-195-114/+112
| |\
| | * Reset connection while data state changed.Wink Saville2011-05-185-114/+112
| | | | | | | | | | | | | | | | | | | | | Check data call states and reset connection if any link properties changed. Change-Id: I008aea969378648192852161959fdf4aad6211a1
* | | am 605be31c: am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change ↵Joe Fernandez2011-05-193-5/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 * commit '605be31c4a80e03dc0af76a73aaa33316ca4a635': docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
| * | am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb ↵Joe Fernandez2011-05-193-5/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 * commit '146a0b4522db2d782953a464fe63adcd7e1569c2': docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
| | * \ am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: ↵Joe Fernandez2011-05-193-5/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 * commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f': docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
| | | * \ Merge "docs: Cherrypicking change from honeycomb Change-Id: ↵Joe Fernandez2011-05-193-5/+15
| | | |\ \ | | | | | | | | | | | | | | | | | | I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
| | | | * | docs: Cherrypicking change from honeycomb Change-Id: ↵Joe Fernandez2011-05-173-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I6b62a5c608d3f17f5ff3c81773dc3055d0428d74 Change-Id: I85e6b923857d538df8e1e040030aa988279de9eb
* | | | | | am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-193-0/+45
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7': USB: Add method to access raw USB device descriptors
| * | | | | am a88b42d5: USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-193-0/+45
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'a88b42d569a91290477d8f5731a2ee43931271da': USB: Add method to access raw USB device descriptors
| | * | | | USB: Add method to access raw USB device descriptorsMike Lockwood2011-05-193-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am d466a463: am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up ↵Adam Powell2011-05-182-3/+39
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sizing/padding for smaller tablets." into honeycomb-mr2 * commit 'd466a4631f3e4f482dd658f42c277d6ad281a9d1': DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
| * | | | | am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding ↵Adam Powell2011-05-182-3/+39
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for smaller tablets." into honeycomb-mr2 * commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d': DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
| | * | | | Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller ↵Adam Powell2011-05-182-3/+39
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | tablets." into honeycomb-mr2
| | | * | | | DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.Adam Powell2011-05-182-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56a75189ae48f04934882661ce5014549a089769
* | | | | | | am 582841e7: am b18e700c: am aa0834e3: Merge "LayoutLib: support the new ↵Xavier Ducrohet2011-05-183-21/+33
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baseline/margin query API." into honeycomb-mr1 * commit '582841e734bc85b247df64ac85b6ee09f7375f44': LayoutLib: support the new baseline/margin query API.
| * | | | | | am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin ↵Xavier Ducrohet2011-05-183-21/+33
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | query API." into honeycomb-mr1 * commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693': LayoutLib: support the new baseline/margin query API.
| | * | | | | am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." ↵Xavier Ducrohet2011-05-183-21/+33
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0': LayoutLib: support the new baseline/margin query API.
| | | * | | | Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1Xavier Ducrohet2011-05-183-21/+33
| | | |\ \ \ \
| | | | * | | | LayoutLib: support the new baseline/margin query API.Xavier Ducrohet2011-05-163-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I856489df655960820b8eaa4c6179515a5c069b00
* | | | | | | | am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive ↵James Dong2011-05-184-29/+155
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bitrate wvm content no longer" into honeycomb-mr2 * commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0': Using widevine:// to stream adaptive bitrate wvm content no longer
| * | | | | | | am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content ↵James Dong2011-05-184-29/+155
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | no longer" into honeycomb-mr2 * commit 'd148a499c27145e0473f89ece0500ebed38f875f': Using widevine:// to stream adaptive bitrate wvm content no longer
| | * | | | | | Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" ↵James Dong2011-05-184-29/+155
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2
| | | * | | | | | Using widevine:// to stream adaptive bitrate wvm content no longerAndreas Huber2011-05-104-29/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses stagefright's http cache but defers caching to the WVMExtractor, which now has the responsibility of reporting buffer status/duration. Change-Id: Ieec64a20203977fd0a61d0c6834da124de78bfa2 related-to-bug: 4390283
* | | | | | | | | am 59b1a4ed: Switch to use netd to add/remove routes.Robert Greenwalt2011-05-186-170/+292
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '59b1a4ede7032c1b4d897e13dd4ede09b5e14743': Switch to use netd to add/remove routes.
| * | | | | | | | Switch to use netd to add/remove routes.Robert Greenwalt2011-05-186-170/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds support for v6 routes and for removing single routes. Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
* | | | | | | | | Merge 4b999030Jean-Baptiste Queru2011-05-183-1/+77
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
| * \ \ \ \ \ \ \ \ am 6c427617: Merge "support humidity sensor type"Jean-Baptiste Queru2011-05-183-1/+77
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6c427617be940be32fdebbd9c78f9223b292c814': support humidity sensor type
| | * \ \ \ \ \ \ \ \ Merge "support humidity sensor type"Jean-Baptiste Queru2011-05-183-1/+77
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | support humidity sensor typeUrs Fleisch2011-04-133-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4156842677e91de0f922284d196147ff61e71a70
* | | | | | | | | | | | am 8416e5cf: am 6ad07db7: Merge "Fix fake display size when rotated." into ↵Dianne Hackborn2011-05-181-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '8416e5cf0a8439a3f605629068d3639f2a35e08b': Fix fake display size when rotated.
| * | | | | | | | | | | am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2Dianne Hackborn2011-05-181-2/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | * commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548': Fix fake display size when rotated.
| | * | | | | | | | | Merge "Fix fake display size when rotated." into honeycomb-mr2Dianne Hackborn2011-05-181-2/+16
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Fix fake display size when rotated.Dianne Hackborn2011-05-181-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
* | | | | | | | | | | am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font ↵Jean-Baptiste Queru2011-05-182-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files." * commit 'a38762f340853cca5a07732c21e9fb816fd252b8': MOTOYA changed two kinds of Japanese font files.
| * | | | | | | | | | am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."Jean-Baptiste Queru2011-05-182-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391': MOTOYA changed two kinds of Japanese font files.
| | * | | | | | | | | Merge "MOTOYA changed two kinds of Japanese font files."Jean-Baptiste Queru2011-05-182-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | MOTOYA changed two kinds of Japanese font files.yoshinaka2011-04-062-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <The design image was changed to the full size> From "U+FF10 fullwidth zero" to "U+FF19 fullwidth nine" <Following characters were added> "U+203C double exclamation poin","U+2047 double question mark","U+2048 question exclamation point" "U+2049 exclamation question mark","U+261A Black left pointing index","U+261B Black right pointing index" "U+261C White left pointing index","U+261D White up pointing index","U+261E White right pointing index" "U+261F White down pointing index" Change-Id: I1641926c13ce8e11fde794f5584119ad44607374
* | | | | | | | | | | | am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed ↵Gloria Wang2011-05-184-17/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit of the following:" into honeycomb-mr2 * commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| * | | | | | | | | | | am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the ↵Gloria Wang2011-05-184-17/+28
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | following:" into honeycomb-mr2 * commit '07e9267d33bb199d0a2b8de221c64541bdf2465a': DO NOT MERGE For bug 4422428 Squashed commit of the following:
| | * | | | | | | | | | Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into ↵Gloria Wang2011-05-184-17/+28
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2
| | | * | | | | | | | | | DO NOT MERGEGloria Wang2011-05-134-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For bug 4422428 Squashed commit of the following: commit ae2e13783db2284f40d3891e70e152dab941edfc Author: Gloria Wang <gwang@google.com> Date: Fri May 13 11:43:11 2011 -0700 Add one more DRM error code. For bug 4422428. Change-Id: I4e333f474c96c0e0f162dde4013ad32b336bebd6 commit 0f88249d0cb5221f622cf1d1ac3cdccefb8f58a2 Author: Gloria Wang <gwang@google.com> Date: Fri Apr 29 10:44:46 2011 -0700 Add DRM errors in the DRM frameworks to MediaErrors also. For bug 4350156. Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394 Change-Id: Ia02de462159400eef8c015d28531bf1dd6796a18
* | | | | | | | | | | | | am 01758e81: Linkproperties update via unsol data call state change.Kazuhiro Ondo2011-05-187-22/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '01758e81b3ad89934581885bb2fc7006510ec639': Linkproperties update via unsol data call state change.
| * | | | | | | | | | | | Linkproperties update via unsol data call state change.Kazuhiro Ondo2011-05-177-22/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handles the scenario of radio technology handover with IP continuity. Once RIL/Modem finished a handover operation, an unsol data call state change will be send up to FW notifying all link propertes changes. FW will then re-configure the device with new link properties including iptable used by Tethering. Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
* | | | | | | | | | | | | am 258208a7: Merge "Remove SIM operator name hack" into honeycomb-LTEWink Saville2011-05-171-5/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '258208a78ca90a7d3a45a2f15af4bbb21a266f47': Remove SIM operator name hack
| * | | | | | | | | | | | Merge "Remove SIM operator name hack" into honeycomb-LTEWink Saville2011-05-171-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Remove SIM operator name hackKazuhiro Ondo2011-05-171-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28c6f94dd6c6bab3a3025f67013a39b3ea0fb0a1
* | | | | | | | | | | | | | am 98603eed: am 30a76196: Merge "Fix bug 4416126 - orientation change bug ↵Adam Powell2011-05-171-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with action bar overflow menu" into honeycomb-mr2 * commit '98603eed2ff95d1d0dcb7fc1ecf3c35f3b447f55': Fix bug 4416126 - orientation change bug with action bar overflow menu
| * | | | | | | | | | | | | am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar ↵Adam Powell2011-05-171-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow menu" into honeycomb-mr2 * commit '30a76196c8f426b530a80166817d3280acb2b100': Fix bug 4416126 - orientation change bug with action bar overflow menu
| | * | | | | | | | | | | | Merge "Fix bug 4416126 - orientation change bug with action bar overflow ↵Adam Powell2011-05-171-3/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | menu" into honeycomb-mr2