OSDN Git Service
Elliott Hughes [Tue, 12 Apr 2011 17:19:11 +0000 (10:19 -0700)]
Merge "Kill the global references in the OpenGL wrappers."
Andreas Huber [Tue, 12 Apr 2011 16:25:32 +0000 (09:25 -0700)]
Merge "Experimental support for changing the video surface/texture on an active mediaplayer"
Andreas Huber [Tue, 12 Apr 2011 15:36:59 +0000 (08:36 -0700)]
Merge "If the media extractor specifies an invalid thumbnail time, default to the first frame."
Benoit Goby [Tue, 12 Apr 2011 03:26:41 +0000 (20:26 -0700)]
am
0b9b8711: am
43be7a61: EthernetDataTracker: implement setDependencyMet
* commit '
0b9b8711a1a2107dc913cc751b7d981fce4f3082':
EthernetDataTracker: implement setDependencyMet
Benoit Goby [Tue, 12 Apr 2011 03:23:42 +0000 (20:23 -0700)]
am
43be7a61: EthernetDataTracker: implement setDependencyMet
* commit '
43be7a6120d9dd2ee0902de2322aec2ee75b0351':
EthernetDataTracker: implement setDependencyMet
Benoit Goby [Tue, 12 Apr 2011 02:07:11 +0000 (19:07 -0700)]
resolved conflicts for merge of
31659471 to master
Change-Id: Ib49a1ef39455af8b01c3feb7fcb5393e0a4ceec9
Benoit Goby [Tue, 12 Apr 2011 01:53:57 +0000 (18:53 -0700)]
am
2869d171: resolved conflicts for merge of
08c39c6a to honeycomb-LTE
* commit '
2869d1715d815ef2b357bf182d384515cdf6f9ab':
Add support for USB Ethernet adapters
Benoit Goby [Tue, 12 Apr 2011 01:41:23 +0000 (18:41 -0700)]
resolved conflicts for merge of
08c39c6a to honeycomb-LTE
Change-Id: I79f8ac1dc8ff9f5d0559d37043b850cd26246b92
Brad Fitzpatrick [Tue, 12 Apr 2011 00:32:37 +0000 (17:32 -0700)]
am
07c25b65: am
4430670f: am
ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '
07c25b651216daac884bd503c02b788418165b50':
audioflinger: Enable ARMv5TE optimized resampler
Xavier Ducrohet [Tue, 12 Apr 2011 00:28:59 +0000 (17:28 -0700)]
am
1f2a307b: resolved conflicts for merge of
4754c79a to honeycomb-plus-aosp
* commit '
1f2a307b59a6f1d61390425b52c3f0aafc21c54b':
LayoutLib: don't render when shader's local matrix is set to 0 scale.
Elliott Hughes [Tue, 12 Apr 2011 00:27:53 +0000 (17:27 -0700)]
Merge "You don't need to poke around inside FileDescriptor manually."
Brad Fitzpatrick [Tue, 12 Apr 2011 00:27:12 +0000 (17:27 -0700)]
am
4430670f: am
ca7ad44a: Merge "audioflinger: Enable ARMv5TE optimized resampler"
* commit '
4430670f48f75661293371dab8db55865f5f56e0':
audioflinger: Enable ARMv5TE optimized resampler
Xavier Ducrohet [Tue, 12 Apr 2011 00:11:41 +0000 (17:11 -0700)]
resolved conflicts for merge of
4754c79a to honeycomb-plus-aosp
Change-Id: I3e7bd605e08be0c45533d4c9193727bbf413d342
Xavier Ducrohet [Mon, 11 Apr 2011 23:33:12 +0000 (16:33 -0700)]
am
fc1bf925: resolved conflicts for merge of
efa98a29 to honeycomb-plus-aosp
* commit '
fc1bf9256372018188468b8ba5163ac5dcc74f56':
Merge
c5aeac7f from honeycomb.
Gilles Debunne [Mon, 11 Apr 2011 23:21:38 +0000 (16:21 -0700)]
Merge "Fix in BreakIterator."
Xavier Ducrohet [Mon, 11 Apr 2011 23:15:54 +0000 (16:15 -0700)]
resolved conflicts for merge of
efa98a29 to honeycomb-plus-aosp
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
Elliott Hughes [Sat, 9 Apr 2011 03:01:01 +0000 (20:01 -0700)]
Kill the global references in the OpenGL wrappers.
Just use jniThrowException instead. Note that it would be trivial to throw
seemingly more appropriate exceptions (NullPointerException and
OutOfMemoryException in particular), but I'm only attempting to preserve
existing behavior here.
I also found shadowing bugs in some of the special-case functions, which
would previously always have leaked memory.
This also moves an accidental change to a generated file (ActivityThread ->
AppGlobals) into the generator, so it won't be overwritten in future.
Change-Id: Iab570310b568cb406c60dd0e2b8211f8a36ae590
Eric Fischer [Mon, 11 Apr 2011 21:36:47 +0000 (14:36 -0700)]
Merge "Import revised translations."
Mike Lockwood [Mon, 11 Apr 2011 21:28:34 +0000 (14:28 -0700)]
am
9e13c7e5: am
9645081c: am
43707a83: UsbManager: minor Javadoc tweak
* commit '
9e13c7e5d787252b2a88aace1115b51a95e16b5d':
UsbManager: minor Javadoc tweak
Jason parks [Mon, 11 Apr 2011 21:28:30 +0000 (14:28 -0700)]
am
f953d3e2: am
7f506024: am
78a9766b: Merge "Implement teardown script." into gingerbread
* commit '
f953d3e2eac2af121e4b83f6bf613e0800fd7952':
Implement teardown script.
Jeff Hamilton [Mon, 11 Apr 2011 21:28:27 +0000 (14:28 -0700)]
am
a83bc160: am
7bb236c3: am
84d34078: Make the NFC UID forward compatible.
* commit '
a83bc160892078c20489897190ee163d5c4d3783':
Make the NFC UID forward compatible.
James Dong [Mon, 11 Apr 2011 21:28:24 +0000 (14:28 -0700)]
am
6f2b5d61: (-s ours) 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 '
6f2b5d614c13fb93f20697bce3bf73176828276d':
When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
Mike Lockwood [Mon, 11 Apr 2011 21:24:11 +0000 (14:24 -0700)]
am
9645081c: am
43707a83: UsbManager: minor Javadoc tweak
* commit '
9645081cc7f31e1151fedbcd5932a100719e91e4':
UsbManager: minor Javadoc tweak
Jason parks [Mon, 11 Apr 2011 21:24:06 +0000 (14:24 -0700)]
am
7f506024: am
78a9766b: Merge "Implement teardown script." into gingerbread
* commit '
7f506024e989c2c7dfa8f9f72ea088944e307c26':
Implement teardown script.
Jeff Hamilton [Mon, 11 Apr 2011 21:23:59 +0000 (14:23 -0700)]
am
7bb236c3: am
84d34078: Make the NFC UID forward compatible.
* commit '
7bb236c3b5e49f53b3110855276d99e664b29931':
Make the NFC UID forward compatible.
James Dong [Mon, 11 Apr 2011 21:23:52 +0000 (14:23 -0700)]
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.
Jeff Brown [Mon, 11 Apr 2011 21:10:56 +0000 (14:10 -0700)]
Merge "Add a sprite controller."
Glenn Kasten [Mon, 11 Apr 2011 19:49:03 +0000 (12:49 -0700)]
am
a7e8385c: am
87ee132a: am
c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
* commit '
a7e8385cb34a19e47fb67bf8f632a8b47503242d':
Enable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 19:46:38 +0000 (12:46 -0700)]
am
87ee132a: am
c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
* commit '
87ee132ac5dd99564d4ad8f05631bbb021dbc0b0':
Enable HDCP debugging in Stagefright (1 of 2)
Glenn Kasten [Mon, 11 Apr 2011 19:43:28 +0000 (12:43 -0700)]
am
c6c2285b: Enable HDCP debugging in Stagefright (1 of 2)
* commit '
c6c2285b36e83b96056e2404371cdf6e6f7acaee':
Enable HDCP debugging in Stagefright (1 of 2)
Amith Yamasani [Mon, 11 Apr 2011 19:14:17 +0000 (12:14 -0700)]
Merge "Package manager changes to store and update user information."
Wink Saville [Mon, 11 Apr 2011 19:11:14 +0000 (12:11 -0700)]
am
1b00dc66: am
3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '
1b00dc66d4b61b9a2bf44f76a9d3f54be91a2dbf':
Move ProcessedMessage into HierarchicalStateMachine.
Wink Saville [Mon, 11 Apr 2011 19:08:19 +0000 (12:08 -0700)]
am
3156a8c1: Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
* commit '
3156a8c1694756dfa74c3918867f528bcf916e28':
Move ProcessedMessage into HierarchicalStateMachine.
Wink Saville [Mon, 11 Apr 2011 19:04:47 +0000 (12:04 -0700)]
Merge "Move ProcessedMessage into HierarchicalStateMachine." into honeycomb-LTE
Freeman Ng [Mon, 11 Apr 2011 18:30:21 +0000 (11:30 -0700)]
am
2df36fd6: am
b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
* commit '
2df36fd6ec39e096327032283d058b48be19e843':
Add prepaid data services URL to Secure Settings
Freeman Ng [Mon, 11 Apr 2011 18:19:18 +0000 (11:19 -0700)]
am
b7e8a54d: Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
* commit '
b7e8a54d98f753406c8763a7075e5f6b92e9300e':
Add prepaid data services URL to Secure Settings
Freeman Ng [Mon, 11 Apr 2011 18:10:18 +0000 (11:10 -0700)]
Merge "Add prepaid data services URL to Secure Settings" into honeycomb-LTE
Jason Simmons [Mon, 11 Apr 2011 17:43:41 +0000 (10:43 -0700)]
Merge "In the MP3 extractor, compute timestamps based on sample count instead of byte count. This fixes timestamp accuracy on VBR streams."
Wink Saville [Sat, 9 Apr 2011 15:05:31 +0000 (08:05 -0700)]
am
6e797566: am
442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
* commit '
6e797566650c10ba8655aea914d521f5999073e8':
Cleanup all functions overridden from DCT in GDCT
Wink Saville [Sat, 9 Apr 2011 14:57:35 +0000 (07:57 -0700)]
am
442b08bc: Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
* commit '
442b08bc7c934f601a111bf97ea96842d69cdc23':
Cleanup all functions overridden from DCT in GDCT
Wink Saville [Sat, 9 Apr 2011 14:50:37 +0000 (07:50 -0700)]
Merge "Cleanup all functions overridden from DCT in GDCT" into honeycomb-LTE
Elliott Hughes [Sat, 9 Apr 2011 01:37:01 +0000 (18:37 -0700)]
Merge "Tidy up exception throwing in the media native code."
Dianne Hackborn [Sat, 9 Apr 2011 01:28:14 +0000 (18:28 -0700)]
Merge "Rework thumbnails in activity manager."
Jamie Gennis [Sat, 9 Apr 2011 00:43:33 +0000 (17:43 -0700)]
am
0fb4e73f: am
3a9f5143: am
66380f76: Stagefright: authenticate ANativeWindow.
* commit '
0fb4e73f5fd107b0ebd1c7a1a25dc40d99cf0705':
Stagefright: authenticate ANativeWindow.
Jamie Gennis [Sat, 9 Apr 2011 00:41:38 +0000 (17:41 -0700)]
am
3a9f5143: am
66380f76: Stagefright: authenticate ANativeWindow.
* commit '
3a9f5143efe63b4b94a1bd1312e0ba618a58674f':
Stagefright: authenticate ANativeWindow.
Jamie Gennis [Sat, 9 Apr 2011 00:40:00 +0000 (17:40 -0700)]
am
66380f76: Stagefright: authenticate ANativeWindow.
* commit '
66380f768c0de8bde1f54ac6ab3f126b66928dad':
Stagefright: authenticate ANativeWindow.
Robert Greenwalt [Sat, 9 Apr 2011 00:23:50 +0000 (17:23 -0700)]
am
da2790fa: am
658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
* commit '
da2790fa0adc187440c35261256c9989ca1b6ed8':
Make ApnSettings threadsafe.
Robert Greenwalt [Sat, 9 Apr 2011 00:21:43 +0000 (17:21 -0700)]
am
658779f5: Merge "Make ApnSettings threadsafe." into honeycomb-LTE
* commit '
658779f5d81031dc2c34ef6bc374fad394d01465':
Make ApnSettings threadsafe.
Robert Greenwalt [Sat, 9 Apr 2011 00:19:53 +0000 (17:19 -0700)]
Merge "Make ApnSettings threadsafe." into honeycomb-LTE
Joe Onorato [Sat, 9 Apr 2011 00:10:57 +0000 (17:10 -0700)]
Merge "Use the new API file format, and some minor tweaks to the old XML files that make the parser easier."
Robert Greenwalt [Fri, 8 Apr 2011 23:44:42 +0000 (16:44 -0700)]
am
ede9ed9f: am
1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
* commit '
ede9ed9f704979a373b6b8676373611409cff92f':
Fix getActiveApnTypes for GsmDCT.
Robert Greenwalt [Fri, 8 Apr 2011 23:44:32 +0000 (16:44 -0700)]
am
de78352c: am
ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
* commit '
de78352c6c048e009fbeefb40a2b06a8573f7b7e':
Fix notification of disconnected networks.
Robert Greenwalt [Fri, 8 Apr 2011 23:38:39 +0000 (16:38 -0700)]
am
1eeeae59: Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
* commit '
1eeeae59d07ccc6b7db865b942d3e0b9394b1a59':
Fix getActiveApnTypes for GsmDCT.
Robert Greenwalt [Fri, 8 Apr 2011 23:38:34 +0000 (16:38 -0700)]
am
ac9c73ae: Merge "Fix notification of disconnected networks." into honeycomb-LTE
* commit '
ac9c73ae619aee63f49cf1f845ef5588bd46dce8':
Fix notification of disconnected networks.
Robert Greenwalt [Fri, 8 Apr 2011 23:31:03 +0000 (16:31 -0700)]
Merge "Fix getActiveApnTypes for GsmDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 23:22:06 +0000 (16:22 -0700)]
Merge "Fix notification of disconnected networks." into honeycomb-LTE
Elliott Hughes [Fri, 8 Apr 2011 23:15:26 +0000 (16:15 -0700)]
Merge "More JNI exception-throwing cleanup."
Brian Carlstrom [Fri, 8 Apr 2011 22:40:06 +0000 (15:40 -0700)]
Merge "Add keychain user with special keystore access permissions"
Wink Saville [Fri, 8 Apr 2011 22:31:24 +0000 (15:31 -0700)]
am
4a28096d: am
73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
* commit '
4a28096dec16666d9425cb8e23641985f963a4f3':
Check different CellLocation type in GsmDataConnectionTracker
Robert Greenwalt [Fri, 8 Apr 2011 22:31:21 +0000 (15:31 -0700)]
am
01f8f290: am
63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
* commit '
01f8f290cd2c01c7ed9a1966f39fa74032352dc8':
Rename PhoneBase's DataConnectionTracker member.
Wink Saville [Fri, 8 Apr 2011 22:25:14 +0000 (15:25 -0700)]
Merge "resolved conflicts for merge of
4b1a37d7 to master"
Wink Saville [Fri, 8 Apr 2011 21:57:51 +0000 (14:57 -0700)]
resolved conflicts for merge of
4b1a37d7 to master
Change-Id: I872f40b0e0de534a37e3cf6bdc4d175b66226188
Fabrice Di Meglio [Fri, 8 Apr 2011 21:51:08 +0000 (14:51 -0700)]
Merge "TextLayoutCache - add glyphs caching"
Brian Carlstrom [Fri, 8 Apr 2011 20:44:08 +0000 (13:44 -0700)]
Add keychain user with special keystore access permissions
Change-Id: I02fe5171add62c5cd9f57b01bc137f3bc1cb3a69
Wink Saville [Fri, 8 Apr 2011 20:23:24 +0000 (13:23 -0700)]
am
73ad388a: Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
* commit '
73ad388aae28213dd3f47bcac1b52c671e3cacc7':
Check different CellLocation type in GsmDataConnectionTracker
Wink Saville [Fri, 8 Apr 2011 20:20:20 +0000 (13:20 -0700)]
Merge "Check different CellLocation type in GsmDataConnectionTracker" into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 19:23:49 +0000 (12:23 -0700)]
am
63edf6c4: Rename PhoneBase\'s DataConnectionTracker member.
* commit '
63edf6c4f5795009e55f2ae9556550c38daa9774':
Rename PhoneBase's DataConnectionTracker member.
Wink Saville [Fri, 8 Apr 2011 18:35:11 +0000 (11:35 -0700)]
am
5203a5bc: Cleanup debugging.
* commit '
5203a5bc28a5ae432eab236780b2f97bdec71dbf':
Cleanup debugging.
Wink Saville [Fri, 8 Apr 2011 17:44:43 +0000 (10:44 -0700)]
am
b9381109: am
1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
* commit '
b93811091d8e412d1247ee1f4506b7db1439235d':
DataConnection: set CID to the correct value.
Wink Saville [Fri, 8 Apr 2011 17:41:09 +0000 (10:41 -0700)]
am
1905e166: Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
* commit '
1905e166ed40ee11e80476848ef40e817512f740':
DataConnection: set CID to the correct value.
Wink Saville [Fri, 8 Apr 2011 17:38:25 +0000 (10:38 -0700)]
Merge "DataConnection: set CID to the correct value." into honeycomb-LTE
Brian Carlstrom [Fri, 8 Apr 2011 17:28:34 +0000 (10:28 -0700)]
Merge "Tolerate missing AccountManager resource, not just missing resource name"
Robert Greenwalt [Fri, 8 Apr 2011 17:11:43 +0000 (10:11 -0700)]
am
2ce73e77: am
9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
* commit '
2ce73e77c99effb9521db15c882529ccbafd57a6':
Fix isApnTypeActive in GDCT.
Robert Greenwalt [Fri, 8 Apr 2011 17:09:03 +0000 (10:09 -0700)]
am
9c7f433c: Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
* commit '
9c7f433c80fd2014562f8d161e6a34710fe475d6':
Fix isApnTypeActive in GDCT.
Elliott Hughes [Fri, 8 Apr 2011 17:08:19 +0000 (10:08 -0700)]
Merge "Use jniThrowException for exception throwing from native code."
Robert Greenwalt [Fri, 8 Apr 2011 17:07:31 +0000 (10:07 -0700)]
Merge "Fix isApnTypeActive in GDCT." into honeycomb-LTE
Robert Greenwalt [Fri, 8 Apr 2011 17:07:26 +0000 (10:07 -0700)]
am
e3e535a9: am
4410660e: Fix ISO country code of Slovenia.
* commit '
e3e535a9c6b35971b54becc912e45da0f8b3f727':
Fix ISO country code of Slovenia.
Robert Greenwalt [Fri, 8 Apr 2011 17:05:01 +0000 (10:05 -0700)]
am
4410660e: Fix ISO country code of Slovenia.
* commit '
4410660e02c04b29d323c6d3bf81633fd07b6411':
Fix ISO country code of Slovenia.
Teng-Hui Zhu [Fri, 8 Apr 2011 16:19:01 +0000 (09:19 -0700)]
Merge "Don't send pause again when coming back from full screen"
Wu-cheng Li [Fri, 8 Apr 2011 09:47:39 +0000 (02:47 -0700)]
Merge "Add camera focus area API."
Dianne Hackborn [Fri, 8 Apr 2011 01:46:54 +0000 (18:46 -0700)]
Merge "Improve activity manager debug dumps."
Nicolas Roard [Fri, 8 Apr 2011 00:27:53 +0000 (17:27 -0700)]
am
16d8de7a: am
3e37a2f3: am
fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
* commit '
16d8de7a293e5d626823a59f2d8b74e0d4a75cbd':
Remove uncalled function -- java counterpart of the fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:25:56 +0000 (17:25 -0700)]
am
3e37a2f3: am
fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
* commit '
3e37a2f3ae3e3a777bf479a6562063922a7e44c6':
Remove uncalled function -- java counterpart of the fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:24:05 +0000 (17:24 -0700)]
am
fcba2353: Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
* commit '
fcba23536b1b432a5977e1ba4ea70ae0ff5aed4a':
Remove uncalled function -- java counterpart of the fix for bug:
4183801
Nicolas Roard [Fri, 8 Apr 2011 00:21:53 +0000 (17:21 -0700)]
Merge "Remove uncalled function -- java counterpart of the fix for bug:
4183801" into honeycomb-mr1
Adam Cohen [Fri, 8 Apr 2011 00:12:19 +0000 (17:12 -0700)]
Merge "Fix crash in bug
4259574"
Daisuke Miyakawa [Fri, 8 Apr 2011 00:03:18 +0000 (17:03 -0700)]
Merge "Add params for primary account to ContactsContract"
Wink Saville [Thu, 7 Apr 2011 23:53:34 +0000 (16:53 -0700)]
am
5f66c953: am
7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
* commit '
5f66c953a7ebf5dd6dc2ce1c79f2c2ee324dd13b':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
Wink Saville [Thu, 7 Apr 2011 23:51:50 +0000 (16:51 -0700)]
am
7183a7a5: Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
* commit '
7183a7a584397142ab7347d6f721011d743fb699':
Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall.
Wink Saville [Thu, 7 Apr 2011 23:49:02 +0000 (16:49 -0700)]
Merge "Add RIL_UNSOL_RIL_CONNECTED and pass radio technology + 2 to setupDataCall." into honeycomb-LTE
Robert Greenwalt [Thu, 7 Apr 2011 23:01:46 +0000 (16:01 -0700)]
Merge "Fix build."
Bill Gruber [Thu, 7 Apr 2011 22:20:16 +0000 (15:20 -0700)]
am
60bfa4d0: am
216d9894: am
6bb8b0ec: am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
60bfa4d0f5d55eb474146330be7f5404521b1c67':
IAB docs--status codes fix Bug:
4208641
Bill Gruber [Thu, 7 Apr 2011 22:17:26 +0000 (15:17 -0700)]
am
216d9894: am
6bb8b0ec: am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
216d98949ddeb84359836594ab00be158d69545e':
IAB docs--status codes fix Bug:
4208641
Bill Gruber [Thu, 7 Apr 2011 22:14:54 +0000 (15:14 -0700)]
am
6bb8b0ec: am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
6bb8b0ecb558373ba99e44ad5c351e1d7bb410d6':
IAB docs--status codes fix Bug:
4208641
Bill Gruber [Thu, 7 Apr 2011 22:09:33 +0000 (15:09 -0700)]
am
afecd1e9: IAB docs--status codes fix Bug:
4208641
* commit '
afecd1e99284dc386f07571c69edfed8c12f1cef':
IAB docs--status codes fix Bug:
4208641
Wink Saville [Thu, 7 Apr 2011 21:31:20 +0000 (14:31 -0700)]
am
de1b950d: am
9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '
de1b950d2b07737e3d284ed2ada361737d8a5a1a':
ConnectivityService needs to use the new names for the NetConfig vars.
Wink Saville [Thu, 7 Apr 2011 21:29:17 +0000 (14:29 -0700)]
am
9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
* commit '
9e7a5a1e567a0e696d9a7b68fffd00b7408e6ac1':
ConnectivityService needs to use the new names for the NetConfig vars.
Wink Saville [Thu, 7 Apr 2011 21:28:06 +0000 (14:28 -0700)]
Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE
Teng-Hui Zhu [Thu, 7 Apr 2011 21:27:03 +0000 (14:27 -0700)]
am
4e790ee1: (-s ours) am
29fa50be: am
bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* commit '
4e790ee1894118a1ab2032d09e5016fa9414dae7':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
Teng-Hui Zhu [Thu, 7 Apr 2011 21:24:22 +0000 (14:24 -0700)]
am
29fa50be: am
bb55777b: Merge changes Ia44d880a,Ifbf63b24 into honeycomb-mr1
* commit '
29fa50be2484ed9d7a5e8075b764caa37b6494b9':
DO NOT MERGE : cherry pick of change Ieb7ae26b from master
DO NOT MERGE : cherry pick of change I0f9f2c65 from master
OSDN Git Service
