Eric Fischer
7c1a8f7461
Merge "Import revised translations. DO NOT MERGE" into honeycomb
2011-04-14 14:14:46 -07:00
Scott Main
b0ca3a2935
am 2a08e7bf: am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit '2a08e7bf6778fe7494be45c7231e2df3edce5ab4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 14:08:51 -07:00
Scott Main
8fcb75765d
am d08debcb: docs: bring back the SDK EULA wall for downloading archived SDKs
...
* commit 'd08debcb211ec2e369c8c88ce15e4aaadd54a8d4':
docs: bring back the SDK EULA wall for downloading archived SDKs
2011-04-14 13:55:16 -07:00
Xia Wang
001edca47a
am d69ec89f: am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit 'd69ec89f5d31064174d79e2e77504814629cffa6':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:52:39 -07:00
Xia Wang
203f649656
am 46b59ef0: Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
...
* commit '46b59ef01be530a6bbe3f0e9a2bed27de9985f40':
Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi
2011-04-13 15:34:29 -07:00
Xia Wang
aef161d454
Merge "Fix access point parsing: reset static link property after parsing static ip setting Fix removeConfiguredNetwork: add sleep between remove configured network and disable wifi" into honeycomb-mr1
2011-04-13 15:13:10 -07:00
Glenn Kasten
fbdf138926
am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
...
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
Bug 4167061 remove debugging code
2011-04-13 11:52:32 -07:00
Glenn Kasten
ce5c08c2e4
am b0d6f10e: Bug 4167061 remove debugging code
...
* commit 'b0d6f10eedeef099164995d51dbd076a6fcc5acc':
Bug 4167061 remove debugging code
2011-04-13 11:48:28 -07:00
Wink Saville
71d21b7efb
am c078a436: Merge "Fix occasional phone app crash" into honeycomb-LTE
...
* commit 'c078a4362791cec3976c4312d3f7e0e96b3487bf':
Fix occasional phone app crash
2011-04-12 17:00:57 -07:00
Wink Saville
36fb943450
Merge "Fix occasional phone app crash" into honeycomb-LTE
2011-04-12 16:53:54 -07:00
Scott Main
e69ed721c9
am 34b42b2d: am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '34b42b2ded4741e68413d0aa39f3af146629dcec':
docs: fix doc typo
2011-04-12 14:52:30 -07:00
Scott Main
c2b8995c9a
am 7e8902a9: am f42937a8: docs: fix doc typo
...
* commit '7e8902a90566bf05c9bc12f87f4149fc6e3c00a4':
docs: fix doc typo
2011-04-12 14:48:30 -07:00
Scott Main
281c94f89d
am f42937a8: docs: fix doc typo
...
* commit 'f42937a8aa0af6b22d8a2a43a9bfc07c38aeffb5':
docs: fix doc typo
2011-04-12 14:44:02 -07:00
Eric Fischer
17230ed6b1
am 68cb0ffa: (-s ours) am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '68cb0ffad05323dc1df7faeefa8f41586744c293':
Import revised translations. DO NOT MERGE
2011-04-12 13:18:52 -07:00
Scott Main
efeed54cb5
am 91470be4: am c7b94371: am b9fedd97: docs: fix broken links
...
* commit '91470be46644493be89dc277f3c0f987f34bc937':
docs: fix broken links
2011-04-12 13:08:50 -07:00
Scott Main
372f5c0ed2
am c7b94371: am b9fedd97: docs: fix broken links
...
* commit 'c7b94371a0a4cbe853c17c4610a564a5a4d3efd5':
docs: fix broken links
2011-04-12 13:06:50 -07:00
Scott Main
6b923ae419
am b9fedd97: docs: fix broken links
...
* commit 'b9fedd9771a6aedf068155fd91f15baf52e668cd':
docs: fix broken links
2011-04-12 13:02:43 -07:00
Eric Fischer
b7b75cbe6d
am 71a556f2: Import revised translations. DO NOT MERGE
...
* commit '71a556f24e2b8d489bf81b22fab6fe5e99a9eae0':
Import revised translations. DO NOT MERGE
2011-04-12 13:02:15 -07:00
Bill Gruber
a3a19c84bc
am a8c68be8: am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'a8c68be89d3735e5d579e521d0798032303330d3':
Doc fix-corrects the cited download locations
2011-04-12 12:42:26 -07:00
Bill Gruber
46fe2b098d
am df8fc2e1: am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit 'df8fc2e1bfb6abcbea107636f36fae464faf976f':
Doc fix-corrects the cited download locations
2011-04-12 12:23:33 -07:00
Bill Gruber
af40f2d47d
am 9a693ed9: Doc fix-corrects the cited download locations
...
* commit '9a693ed9870cf2d5817a3bfc8dc0fbec4456a3c2':
Doc fix-corrects the cited download locations
2011-04-12 11:48:00 -07:00
Kenny Root
f6bbefd581
resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aosp
...
Change-Id: Ia1a0024aabf531438203eb9fea3a10dd15eabe53
2011-04-12 10:27:15 -07:00
Benoit Goby
77e4ad4610
am 43be7a61: EthernetDataTracker: implement setDependencyMet
...
* commit '43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
2011-04-11 20:23:42 -07:00
Benoit Goby
f3a0fcc94b
am 2869d171: resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
* commit '2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
2011-04-11 18:53:57 -07:00
Benoit Goby
29d013afa9
resolved conflicts for merge of 08c39c6a to honeycomb-LTE
...
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
2011-04-11 18:41:23 -07:00
Brad Fitzpatrick
e80ff06e1c
am 4430670f: am ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
...
* commit '4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler
2011-04-11 17:27:12 -07:00
Xavier Ducrohet
f2ab6bc15f
resolved conflicts for merge of 4754c79a to honeycomb-plus-aosp
...
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
2011-04-11 17:11:41 -07:00
Xavier Ducrohet
b5acb8d716
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
...
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
2011-04-11 16:15:54 -07:00
Kenny Root
8a1a615176
am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."
...
* commit '08d9d9a46250c4fad66e9b637e8898a3524c4286':
Runtime resource overlay, iteration 1.
2011-04-11 15:33:19 -07:00
Mike Lockwood
cdbe0579a5
am 9645081c: am 43707a83: UsbManager: minor Javadoc tweak
...
* commit '9645081cc7f31e1151fedbcd5932a100719e91e4':
UsbManager: minor Javadoc tweak
2011-04-11 14:24:11 -07:00
Jason parks
dd746740c7
am 7f506024: am 78a9766b: Merge "Implement teardown script." into gingerbread
...
* commit '7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.
2011-04-11 14:24:06 -07:00
Jeff Hamilton
3d4cad901c
am 7bb236c3: am 84d34078: Make the NFC UID forward compatible.
...
* commit '7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.
2011-04-11 14:23:59 -07:00
James Dong
eb71e49725
am b0ccbacd: (-s ours) am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE." into gingerbread
...
* commit 'b0ccbacdb35e8e987eb9efd61af13fefd7c2f5f0':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
2011-04-11 14:23:52 -07:00
Glenn Kasten
fe6844cdd8
am 87ee132a: am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit '87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:46:38 -07:00
Glenn Kasten
2c287e4572
am c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
...
* commit 'c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
2011-04-11 12:43:28 -07:00
Wink Saville
2ab253ac63
am 3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
...
* commit '3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.
2011-04-11 12:08:19 -07:00
Wink Saville
3cc95585e2
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
2011-04-11 12:04:47 -07:00
Freeman Ng
0428aaa920
am b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
...
* commit 'b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings
2011-04-11 11:19:18 -07:00
Freeman Ng
90cd144ad3
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
2011-04-11 11:10:18 -07:00
Kenny Root
d59b5d0087
Merge "Runtime resource overlay, iteration 1."
2011-04-11 10:07:15 -07:00
Wink Saville
4c25818c7d
am 442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
...
* commit '442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT
2011-04-09 07:57:35 -07:00
Wink Saville
42b6501ff8
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
2011-04-09 07:50:37 -07:00
Jamie Gennis
e2138567d9
am 3a9f5143: am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:41:38 -07:00
Jamie Gennis
f82a9a29d7
am 66380f76: Stagefright: authenticate ANativeWindow.
...
* commit '66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
2011-04-08 17:40:00 -07:00
Robert Greenwalt
4e3f02dc82
am 658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
...
* commit '658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
2011-04-08 17:21:43 -07:00
Robert Greenwalt
40ff957b48
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
2011-04-08 17:19:53 -07:00
Robert Greenwalt
7fa484bb6f
am 1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
...
* commit '1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.
2011-04-08 16:38:39 -07:00
Robert Greenwalt
76db8f5faf
am ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
...
* commit 'ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.
2011-04-08 16:38:34 -07:00
Robert Greenwalt
884a16e3be
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
2011-04-08 16:31:03 -07:00
Robert Greenwalt
8ad8536fa9
Merge "Fix notification of disconnected networks." into honeycomb-LTE
2011-04-08 16:22:06 -07:00