OSDN Git Service
Eric Fischer [Fri, 22 Oct 2010 23:08:27 +0000 (16:08 -0700)]
am
67496e59: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:06:37 +0000 (16:06 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Eric Fischer [Fri, 22 Oct 2010 23:01:34 +0000 (16:01 -0700)]
am
a3e70a43: Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
Eric Fischer [Fri, 22 Oct 2010 22:59:42 +0000 (15:59 -0700)]
Merge "Add a space before the weekday in the zh_CN lock screen date format." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 21:03:08 +0000 (14:03 -0700)]
am
38993d8d: Merge "Fix issue #
3122240: Expose xlarge in GB." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 21:01:25 +0000 (14:01 -0700)]
Merge "Fix issue #
3122240: Expose xlarge in GB." into gingerbread
Xavier Ducrohet [Fri, 22 Oct 2010 20:38:58 +0000 (13:38 -0700)]
am
c5371fad: Merge "Make layoutlib use the prebuilt of layoutlib_api"
Xavier Ducrohet [Fri, 22 Oct 2010 20:28:39 +0000 (13:28 -0700)]
Merge "Make layoutlib use the prebuilt of layoutlib_api"
Kenny Root [Fri, 22 Oct 2010 19:18:46 +0000 (12:18 -0700)]
am
40763914: Merge "Exit immediately on some linklib failures" into gingerbread
Kenny Root [Fri, 22 Oct 2010 19:17:02 +0000 (12:17 -0700)]
Merge "Exit immediately on some linklib failures" into gingerbread
Justin Ho [Fri, 22 Oct 2010 19:15:36 +0000 (12:15 -0700)]
am
0b01eb26: Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
Justin Ho [Fri, 22 Oct 2010 19:14:26 +0000 (12:14 -0700)]
Merge "DO NOT MERGE - Re-adding missing status_bar_close_on.9 for mdpi emulator" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 19:11:33 +0000 (12:11 -0700)]
am
7ce276b5: Merge "Update script for copying NDK headers/library." into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 19:11:23 +0000 (12:11 -0700)]
am
7c68bc38: Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 17:58:35 +0000 (10:58 -0700)]
Merge "Update script for copying NDK headers/library." into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 17:20:06 +0000 (10:20 -0700)]
Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread
Nick Pelly [Fri, 22 Oct 2010 16:03:21 +0000 (09:03 -0700)]
am
0592832c: Merge "Attempt to fix simulator build." into gingerbread
Merge commit '
0592832c5e61b9c0008a4410f263ea0b0b991f05' into gingerbread-plus-aosp
* commit '
0592832c5e61b9c0008a4410f263ea0b0b991f05':
Attempt to fix simulator build.
Mike Lockwood [Fri, 22 Oct 2010 16:03:17 +0000 (09:03 -0700)]
am
f6572e7e: Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Merge commit '
f6572e7ee413a87f5d243b3d44f798260ac1a18b' into gingerbread-plus-aosp
* commit '
f6572e7ee413a87f5d243b3d44f798260ac1a18b':
GPS: Fix network type logic in requestRefLocation
Kenny Root [Fri, 22 Oct 2010 15:59:24 +0000 (08:59 -0700)]
am
8ad30b5b: Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Merge commit '
8ad30b5b7e380428701a44458393cbc2381f205b' into gingerbread-plus-aosp
* commit '
8ad30b5b7e380428701a44458393cbc2381f205b':
Initialized check in ZipFileRO::findEntryByName
Nick Pelly [Fri, 22 Oct 2010 15:49:51 +0000 (08:49 -0700)]
Merge "Attempt to fix simulator build." into gingerbread
Mike Lockwood [Fri, 22 Oct 2010 15:02:09 +0000 (08:02 -0700)]
Merge "GPS: Fix network type logic in requestRefLocation" into gingerbread
Kenny Root [Fri, 22 Oct 2010 14:55:44 +0000 (07:55 -0700)]
Merge "Initialized check in ZipFileRO::findEntryByName" into gingerbread
Hung-ying Tyan [Fri, 22 Oct 2010 06:15:20 +0000 (23:15 -0700)]
am
1257d330: Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Merge commit '
1257d330dcfdb87214278c8fc9718ea9fc663df6' into gingerbread-plus-aosp
* commit '
1257d330dcfdb87214278c8fc9718ea9fc663df6':
Clean up pending sessions on incoming call in SipService
Hung-ying Tyan [Fri, 22 Oct 2010 06:08:59 +0000 (23:08 -0700)]
Merge "Clean up pending sessions on incoming call in SipService" into gingerbread
Jeff Hamilton [Fri, 22 Oct 2010 04:08:20 +0000 (21:08 -0700)]
am
389a440a: Backport ParcelFileDescriptor.createPipe() from
Merge commit '
389a440ad13f7b16e8f7c7f1670bdd55f1e2112a' into gingerbread-plus-aosp
* commit '
389a440ad13f7b16e8f7c7f1670bdd55f1e2112a':
Backport ParcelFileDescriptor.createPipe() from master.
James Dong [Fri, 22 Oct 2010 03:18:16 +0000 (20:18 -0700)]
am
1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" into gingerbread
Merge commit '
1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410' into gingerbread-plus-aosp
* commit '
1bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410':
Turn the media time adjustment in file writer back on
Dianne Hackborn [Fri, 22 Oct 2010 03:18:11 +0000 (20:18 -0700)]
am
fdbb2168: Merge "Adjust boundaries for screen sizes." into gingerbread
Merge commit '
fdbb2168f7a9a202ee9406d65e7ef98a6745b488' into gingerbread-plus-aosp
* commit '
fdbb2168f7a9a202ee9406d65e7ef98a6745b488':
Adjust boundaries for screen sizes.
Dianne Hackborn [Fri, 22 Oct 2010 03:17:56 +0000 (20:17 -0700)]
am
ba501785: Merge "Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit '
ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit '
ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE
Dianne Hackborn [Fri, 22 Oct 2010 03:17:50 +0000 (20:17 -0700)]
am
bf5efba2: Merge "Fix issue #
3117918: No way to finish a native activity" into gingerbread
Merge commit '
bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp
* commit '
bf5efba238f81330f4b473e92b6931b85baa1cbc':
Fix issue #
3117918: No way to finish a native activity
James Dong [Fri, 22 Oct 2010 03:06:59 +0000 (20:06 -0700)]
Merge "Turn the media time adjustment in file writer back on" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:21:28 +0000 (19:21 -0700)]
Merge "Adjust boundaries for screen sizes." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:20:49 +0000 (19:20 -0700)]
Merge "Implement issue #
3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 02:09:44 +0000 (19:09 -0700)]
Merge "Fix issue #
3117918: No way to finish a native activity" into gingerbread
Jeff Brown [Fri, 22 Oct 2010 01:05:53 +0000 (18:05 -0700)]
am
6b3178a6: Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Merge commit '
6b3178a6323e015644590ebaee86523e4bb81773' into gingerbread-plus-aosp
* commit '
6b3178a6323e015644590ebaee86523e4bb81773':
Fix a race condition in wallpaper move throttling.
Jeff Brown [Fri, 22 Oct 2010 01:02:54 +0000 (18:02 -0700)]
Merge "Fix a race condition in wallpaper move throttling." into gingerbread
Dianne Hackborn [Fri, 22 Oct 2010 00:35:12 +0000 (17:35 -0700)]
am
e9dbf208: Merge "Fix issue #
3117472: Format storage dialog still broken" into gingerbread
Merge commit '
e9dbf208e4f72b41dc3961d9d4570d5b69126307' into gingerbread-plus-aosp
* commit '
e9dbf208e4f72b41dc3961d9d4570d5b69126307':
Fix issue #
3117472: Format storage dialog still broken
Dianne Hackborn [Fri, 22 Oct 2010 00:28:19 +0000 (17:28 -0700)]
Merge "Fix issue #
3117472: Format storage dialog still broken" into gingerbread
Mathias Agopian [Fri, 22 Oct 2010 00:07:15 +0000 (17:07 -0700)]
am
aa6df366: Merge "fix [
3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Merge commit '
aa6df3669deab2a804c6f8cc1ea3fd5af0a28685' into gingerbread-plus-aosp
* commit '
aa6df3669deab2a804c6f8cc1ea3fd5af0a28685':
fix [
3119687] [Maps][4.6.0] Force close in street view
Mathias Agopian [Thu, 21 Oct 2010 23:43:00 +0000 (16:43 -0700)]
Merge "fix [
3119687] [Maps][4.6.0] Force close in street view" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 23:26:02 +0000 (16:26 -0700)]
am
0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '
0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp
* commit '
0c636055351f2e1d26138cf7b3bf3c82553e68c4':
Mirror the preview for front-facing cameras. do not merge
Kenny Root [Thu, 21 Oct 2010 23:22:58 +0000 (16:22 -0700)]
am
1d79a9d9: Use correct size of GAMEPAD_KEYCODES
Merge commit '
1d79a9d9f85f932a1fd6dcddba335450b65ba4e6' into gingerbread-plus-aosp
* commit '
1d79a9d9f85f932a1fd6dcddba335450b65ba4e6':
Use correct size of GAMEPAD_KEYCODES
Mathias Agopian [Thu, 21 Oct 2010 23:20:07 +0000 (16:20 -0700)]
Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 22:58:25 +0000 (15:58 -0700)]
fix [
3119687] [Maps][4.6.0] Force close in street view
The EGLConfig attributes MUST be sorted, because they're used in a binary search.
A recent change introduced a bug where 2 of the configs had improperly
sorted attributes.
Change-Id: I1ac53e4463d62f27125ca9f82ed946e6c98ddba0
Kenny Root [Thu, 21 Oct 2010 22:46:03 +0000 (15:46 -0700)]
Use correct size of GAMEPAD_KEYCODES
Compute the actual number of indices in the GAMEPAD_KEYCODES instead of
the pure size in bytes.
Bug:
3121536
Change-Id: I71edbd8bf6eff2c8cc0ea5c6845362b3d1e06466
Kenny Root [Thu, 21 Oct 2010 22:18:28 +0000 (15:18 -0700)]
Initialized check in ZipFileRO::findEntryByName
If a ZipFileRO object is uninitialized, the hash table will not have
been initialized. This condition wasn't checked in findEntryByName.
Bug:
3121109
Change-Id: Ib696e0e7e0cb4dd0fb2e456d6a847e5e8f4fe14e
Chia-chi Yeh [Thu, 21 Oct 2010 19:57:03 +0000 (12:57 -0700)]
am
703aae06: Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Merge commit '
703aae06c0925b19657877bb1872bb2f28874969' into gingerbread-plus-aosp
* commit '
703aae06c0925b19657877bb1872bb2f28874969':
RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples.
Chia-chi Yeh [Thu, 21 Oct 2010 19:53:37 +0000 (12:53 -0700)]
Merge "RTP: Fix non-zero DC in EchoSuppressor caused while aggregating samples." into gingerbread
Nick Kralevich [Thu, 21 Oct 2010 18:50:55 +0000 (11:50 -0700)]
am
62d0970c: Merge "allow dumpstate to work for non-root users." into gingerbread
Merge commit '
62d0970c82f9a2c17aea67379c207a3f17556c46' into gingerbread-plus-aosp
* commit '
62d0970c82f9a2c17aea67379c207a3f17556c46':
allow dumpstate to work for non-root users.
John Huang [Thu, 21 Oct 2010 18:46:55 +0000 (11:46 -0700)]
am
7dc08fb0: Merge "Fix connect duration for un-established SIP calls." into gingerbread
Merge commit '
7dc08fb070ff7455e794fc81645ccb4349cd152f' into gingerbread-plus-aosp
* commit '
7dc08fb070ff7455e794fc81645ccb4349cd152f':
Fix connect duration for un-established SIP calls.
Nick Kralevich [Thu, 21 Oct 2010 18:35:49 +0000 (11:35 -0700)]
Merge "allow dumpstate to work for non-root users." into gingerbread
John Huang [Thu, 21 Oct 2010 17:46:17 +0000 (10:46 -0700)]
Merge "Fix connect duration for un-established SIP calls." into gingerbread
Sylvain Fonteneau [Thu, 21 Oct 2010 16:38:49 +0000 (09:38 -0700)]
am
a71354d7: Enable presence check at application level using RawTagConnection.isConnected() method.
Merge commit '
a71354d76689802152c33af257092d639c03c421' into gingerbread-plus-aosp
* commit '
a71354d76689802152c33af257092d639c03c421':
Enable presence check at application level using
Nick Pelly [Thu, 21 Oct 2010 16:38:15 +0000 (09:38 -0700)]
am
7ea5c45e: NFC settings cleanup.
Merge commit '
7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp
* commit '
7ea5c45e8d89f59065f088d4e11cceeeed9d64d1':
NFC settings cleanup.
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:55 +0000 (09:10 -0700)]
am
15358e14: Merge "Make the base direction of the Arabic error pages RTL"
Merge commit '
15358e145622df90942a444a63ae0006713b636d' into gingerbread-plus-aosp
* commit '
15358e145622df90942a444a63ae0006713b636d':
Make the base direction of the Arabic error pages RTL
Brad Fitzpatrick [Thu, 21 Oct 2010 16:10:47 +0000 (09:10 -0700)]
am
6cf9c394: Merge "Set the base direction of the Hebrew error pages to RTL"
Merge commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b' into gingerbread-plus-aosp
* commit '
6cf9c39452c87fe424a0ca125cf797e1c5e0830b':
Set the base direction of the Hebrew error pages to RTL
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:18 +0000 (07:18 -0700)]
Merge "Make the base direction of the Arabic error pages RTL"
Brad Fitzpatrick [Thu, 21 Oct 2010 14:18:02 +0000 (07:18 -0700)]
Merge "Set the base direction of the Hebrew error pages to RTL"
James Dong [Thu, 21 Oct 2010 04:28:38 +0000 (21:28 -0700)]
am
fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit '
fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp
* commit '
fa7a87fb4b3d25b0b6b0985d65848a144d28df26':
File writer size estimation improvement
Mathias Agopian [Thu, 21 Oct 2010 04:28:34 +0000 (21:28 -0700)]
am
2b2da526: Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Merge commit '
2b2da52608303b149d22418865e67c8030c70e73' into gingerbread-plus-aosp
* commit '
2b2da52608303b149d22418865e67c8030c70e73':
Add a test application to dump all the EGLConfig available
Mathias Agopian [Thu, 21 Oct 2010 04:28:29 +0000 (21:28 -0700)]
am
73655bd2: Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Merge commit '
73655bd2d303f8b3fe5c4bb0d8e4824361647381' into gingerbread-plus-aosp
* commit '
73655bd2d303f8b3fe5c4bb0d8e4824361647381':
propagate RS context priority to EGLContext when possible. DO NOT MERGE.
Mathias Agopian [Thu, 21 Oct 2010 04:28:25 +0000 (21:28 -0700)]
am
583fefc8: Merge "Use the context_priority extension when present." into gingerbread
Merge commit '
583fefc8dcadecc7fc933513d3569dd9c16c100c' into gingerbread-plus-aosp
* commit '
583fefc8dcadecc7fc933513d3569dd9c16c100c':
Use the context_priority extension when present.
James Dong [Thu, 21 Oct 2010 03:07:57 +0000 (20:07 -0700)]
Merge "File writer size estimation improvement" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:05:28 +0000 (20:05 -0700)]
Merge "Add a test application to dump all the EGLConfig available" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:04:52 +0000 (20:04 -0700)]
Merge "propagate RS context priority to EGLContext when possible. DO NOT MERGE." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 03:04:45 +0000 (20:04 -0700)]
Merge "Use the context_priority extension when present." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 01:22:17 +0000 (18:22 -0700)]
am
a0795fc9: Merge "software renderer: fix [
3117351] GL driver doesn\'t set the EGL_NATIVE_VISUAL_ID" into gingerbread
Merge commit '
a0795fc9bdf97703780cbf0ec47c06eccb642e72' into gingerbread-plus-aosp
* commit '
a0795fc9bdf97703780cbf0ec47c06eccb642e72':
software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Jean-Baptiste Queru [Thu, 21 Oct 2010 01:16:57 +0000 (18:16 -0700)]
resolved conflicts for merge of
5d919b43 to gingerbread-plus-aosp
Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d
Mathias Agopian [Thu, 21 Oct 2010 01:00:43 +0000 (18:00 -0700)]
Merge "software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID" into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 00:21:43 +0000 (17:21 -0700)]
software renderer: fix [
3117351] GL driver doesn't set the EGL_NATIVE_VISUAL_ID
Change-Id: I371bc0abfee6065247bc6f04b0e0451645eb2dbf
Dianne Hackborn [Thu, 21 Oct 2010 00:14:59 +0000 (17:14 -0700)]
am
fb2cd0aa: Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Merge commit '
fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de' into gingerbread-plus-aosp
* commit '
fb2cd0aa9d140efdf78f0d920d8e3bb7db39c8de':
Fix java doc on FLAG_EXTERNAL.
Dianne Hackborn [Thu, 21 Oct 2010 00:12:27 +0000 (17:12 -0700)]
Merge "Fix java doc on FLAG_EXTERNAL." into gingerbread
Mathias Agopian [Thu, 21 Oct 2010 00:10:47 +0000 (17:10 -0700)]
Add a test application to dump all the EGLConfig available
Change-Id: Iddf27f2a9dd51733f6b90081a523ca37bfe310fa
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:46:52 +0000 (16:46 -0700)]
Merge "Make disabled TextViews uneditable"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:45:50 +0000 (16:45 -0700)]
am
5bfef1ba: Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Merge commit '
5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04' into gingerbread-plus-aosp
* commit '
5bfef1ba0501e237b3a0fa1abe98e5348d8c5b04':
BatteryService: Set bool to true if sysfs entry is not 0
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:35:17 +0000 (16:35 -0700)]
Merge "BatteryService: Set bool to true if sysfs entry is not 0"
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:33:51 +0000 (16:33 -0700)]
am
81925e66: Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Merge commit '
81925e665c1e25d04cbc10e7333e793416bdc98f' into gingerbread-plus-aosp
* commit '
81925e665c1e25d04cbc10e7333e793416bdc98f':
Fix FastScroller overlay position bug
Jean-Baptiste Queru [Wed, 20 Oct 2010 23:29:15 +0000 (16:29 -0700)]
Merge "Fix FastScroller overlay position bug after setFastScrollEnabled(false)-->setFastScrollEnabled(true) the overlay shows up at the top-left instead of center"
Kenny Root [Wed, 20 Oct 2010 21:13:21 +0000 (14:13 -0700)]
am
ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Merge commit '
ddf8fe505636d3b4435cb9952266765aab20b86d' into gingerbread-plus-aosp
* commit '
ddf8fe505636d3b4435cb9952266765aab20b86d':
Fix isUsbMassStorageConnected() will always return true
Dianne Hackborn [Wed, 20 Oct 2010 21:10:29 +0000 (14:10 -0700)]
am
e9e23405: Merge "Fix issue #
3113424: Battery stats don\'t reset on Crespo" into gingerbread
Merge commit '
e9e23405833a5fedb6a1c2dcec87d84e39d1d13d' into gingerbread-plus-aosp
* commit '
e9e23405833a5fedb6a1c2dcec87d84e39d1d13d':
Fix issue #
3113424: Battery stats don't reset on Crespo
Kenny Root [Wed, 20 Oct 2010 21:10:00 +0000 (14:10 -0700)]
Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread
Dianne Hackborn [Wed, 20 Oct 2010 21:08:26 +0000 (14:08 -0700)]
Merge "Fix issue #
3113424: Battery stats don't reset on Crespo" into gingerbread
Justin Ho [Wed, 20 Oct 2010 21:04:00 +0000 (14:04 -0700)]
am
d5aaff54: Merge "DO NOT MERGE - Updated media playback transport controls (b/
3116268)" into gingerbread
Merge commit '
d5aaff548d62c07fb5fb2d47e58161e77c401616' into gingerbread-plus-aosp
* commit '
d5aaff548d62c07fb5fb2d47e58161e77c401616':
DO NOT MERGE - Updated media playback transport controls (b/
3116268)
Hung-ying Tyan [Wed, 20 Oct 2010 21:03:54 +0000 (14:03 -0700)]
am
4056ab97: Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Merge commit '
4056ab97be6224dcc00ac70843544790f2d65fb7' into gingerbread-plus-aosp
* commit '
4056ab97be6224dcc00ac70843544790f2d65fb7':
Add permission requirements to SipAudioCall and SipManager javadoc.
Hung-ying Tyan [Wed, 20 Oct 2010 21:03:43 +0000 (14:03 -0700)]
am
6037a056: Fix n-way conf call in SipPhone.
Merge commit '
6037a056ea0dda27a286ddcb527b323b58a1c7c7' into gingerbread-plus-aosp
* commit '
6037a056ea0dda27a286ddcb527b323b58a1c7c7':
Fix n-way conf call in SipPhone.
Jeff Hamilton [Wed, 20 Oct 2010 20:57:26 +0000 (13:57 -0700)]
am
23392a84: Fix the build.
Merge commit '
23392a84bcb961d3fd50142ec40ce6ac6db89018' into gingerbread-plus-aosp
* commit '
23392a84bcb961d3fd50142ec40ce6ac6db89018':
Fix the build.
Hung-ying Tyan [Wed, 20 Oct 2010 20:57:20 +0000 (13:57 -0700)]
am
6fe795ec: Do another contact lookup if the first one fails and...
Merge commit '
6fe795ecd35c4d49822d349424fc71b660577dfc' into gingerbread-plus-aosp
* commit '
6fe795ecd35c4d49822d349424fc71b660577dfc':
Do another contact lookup if the first one fails and...
Hung-ying Tyan [Wed, 20 Oct 2010 20:56:59 +0000 (13:56 -0700)]
am
baced375: Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Merge commit '
baced375ba5f374445c44a2115700d69693794a0' into gingerbread-plus-aosp
* commit '
baced375ba5f374445c44a2115700d69693794a0':
Silently reject a ringing call when another call is dialing/ringing.
Dianne Hackborn [Wed, 20 Oct 2010 20:56:03 +0000 (13:56 -0700)]
am
74b1ed32: Fix issue #
3113219: NativeActivity using wrong lib path with Java code
Merge commit '
74b1ed3231b8cafcf4e5cb3f03d794acd5080004' into gingerbread-plus-aosp
* commit '
74b1ed3231b8cafcf4e5cb3f03d794acd5080004':
Fix issue #
3113219: NativeActivity using wrong lib path with Java code
Hung-ying Tyan [Wed, 20 Oct 2010 20:54:25 +0000 (13:54 -0700)]
am
1180f2a0: Merge "Remove ringtone API from SipAudioCall." into gingerbread
Merge commit '
1180f2a099a134c40f923c7e4162a5e7d7ca0184' into gingerbread-plus-aosp
* commit '
1180f2a099a134c40f923c7e4162a5e7d7ca0184':
Remove ringtone API from SipAudioCall.
Dirk Dougherty [Wed, 20 Oct 2010 20:54:09 +0000 (13:54 -0700)]
am
3466e1fc: Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Merge commit '
3466e1fc6db1fed35e2707c67a9ab17673aaf9de' into gingerbread-plus-aosp
* commit '
3466e1fc6db1fed35e2707c67a9ab17673aaf9de':
Doc change: escape angle brackets in javadoc comment.
Justin Ho [Wed, 20 Oct 2010 20:35:40 +0000 (13:35 -0700)]
Merge "DO NOT MERGE - Updated media playback transport controls (b/
3116268)" into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 20:28:02 +0000 (13:28 -0700)]
Merge "Add permission requirements to SipAudioCall and SipManager javadoc." into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 18:49:26 +0000 (11:49 -0700)]
Merge "Silently reject a ringing call when another call is dialing/ringing." into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 16:47:45 +0000 (09:47 -0700)]
Merge "Remove ringtone API from SipAudioCall." into gingerbread
Dirk Dougherty [Wed, 20 Oct 2010 16:34:24 +0000 (09:34 -0700)]
Merge "Doc change: escape angle brackets in javadoc comment." into gingerbread
Hung-ying Tyan [Wed, 20 Oct 2010 06:03:25 +0000 (23:03 -0700)]
am
b595e094: Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Merge commit '
b595e094e3901ff8a224eaf7d4869e7d2e5649dd' into gingerbread-plus-aosp
* commit '
b595e094e3901ff8a224eaf7d4869e7d2e5649dd':
Return display name in SipConnection.getCnapName().
Hung-ying Tyan [Wed, 20 Oct 2010 06:00:16 +0000 (23:00 -0700)]
Merge "Return display name in SipConnection.getCnapName()." into gingerbread
Mathias Agopian [Wed, 20 Oct 2010 01:26:28 +0000 (18:26 -0700)]
am
f4cd9be0: Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Merge commit '
f4cd9be0390135269e22e42fd2e1fe61fdcf9863' into gingerbread-plus-aosp
* commit '
f4cd9be0390135269e22e42fd2e1fe61fdcf9863':
fix [
2236865] STOPSHIP: bump soft gl and egl minor version number
Mathias Agopian [Wed, 20 Oct 2010 01:23:19 +0000 (18:23 -0700)]
Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number" into gingerbread
Mindy Pereira [Wed, 20 Oct 2010 01:23:18 +0000 (18:23 -0700)]
am
6fbc5d9c: DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
Merge commit '
6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1' into gingerbread-plus-aosp
* commit '
6fbc5d9c19388e8f1c9a1833bc0e15fcf6b499f1':
DO NOT MERGE. Make sure to invalidate after pulling on an edgeglow.
OSDN Git Service
