OSDN Git Service
Kazuhiro Ondo [Fri, 9 Sep 2011 20:55:13 +0000 (13:55 -0700)]
am
eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
* commit '
eb7763efa52bad67ff828ad895ff172190e86035':
DO NOT MERGE: Fix leak in SIM ready registrants
Xavier Ducrohet [Thu, 18 Aug 2011 21:48:49 +0000 (14:48 -0700)]
am
f4750724: am
9d829f98: am
21e6e2de: Merge "Change generated dependency file names"
* commit '
f4750724cf8db972a052cb388dc9a39fc7aa6dd6':
Change generated dependency file names
Xavier Ducrohet [Thu, 18 Aug 2011 21:45:36 +0000 (14:45 -0700)]
am
9d829f98: am
21e6e2de: Merge "Change generated dependency file names"
* commit '
9d829f98dc19edecb2305b61b9c79517c4f95383':
Change generated dependency file names
Xavier Ducrohet [Thu, 18 Aug 2011 21:41:56 +0000 (14:41 -0700)]
am
21e6e2de: Merge "Change generated dependency file names"
* commit '
21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
Change generated dependency file names
Xavier Ducrohet [Thu, 18 Aug 2011 21:29:15 +0000 (14:29 -0700)]
Merge "Change generated dependency file names"
Jaikumar Ganesh [Thu, 18 Aug 2011 19:10:02 +0000 (12:10 -0700)]
am
3e941347: am
6f6b21b4: am
4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '
3e9413473f87ad17f3767ffbb0c57046c2db29be':
Bluetooth event loop dispatches dbus data on wakeup
Jaikumar Ganesh [Thu, 18 Aug 2011 19:08:05 +0000 (12:08 -0700)]
am
6f6b21b4: am
4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '
6f6b21b407a8883b92b3de9e028e4dc1550b9648':
Bluetooth event loop dispatches dbus data on wakeup
Jaikumar Ganesh [Thu, 18 Aug 2011 19:06:25 +0000 (12:06 -0700)]
am
4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup"
* commit '
4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
Bluetooth event loop dispatches dbus data on wakeup
Jaikumar Ganesh [Thu, 18 Aug 2011 19:02:35 +0000 (12:02 -0700)]
Merge "Bluetooth event loop dispatches dbus data on wakeup"
Xavier Ducrohet [Wed, 17 Aug 2011 21:38:15 +0000 (14:38 -0700)]
am
5dcda1fd: am
88512f59: am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:35:20 +0000 (14:35 -0700)]
am
88512f59: am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
88512f59bc051a42f4dd70acc8af5622f7e99db6':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:31:08 +0000 (14:31 -0700)]
am
a8313e71: Merge "Fix String16 operator+ to actually work"
* commit '
a8313e71fe8b483448d14e22610101c5f3672744':
Fix String16 operator+ to actually work
Xavier Ducrohet [Wed, 17 Aug 2011 21:18:04 +0000 (14:18 -0700)]
Merge "Fix String16 operator+ to actually work"
Dianne Hackborn [Wed, 17 Aug 2011 03:45:19 +0000 (20:45 -0700)]
am
ee93fd5c: am
7a0d746b: am
baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '
ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
Handle stopping of services with still bound applications.
Dianne Hackborn [Wed, 17 Aug 2011 03:42:17 +0000 (20:42 -0700)]
am
7a0d746b: am
baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '
7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
Handle stopping of services with still bound applications.
Dianne Hackborn [Wed, 17 Aug 2011 03:39:50 +0000 (20:39 -0700)]
am
baaf3ce6: Merge "Handle stopping of services with still bound applications."
* commit '
baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
Handle stopping of services with still bound applications.
Dianne Hackborn [Wed, 17 Aug 2011 02:29:25 +0000 (19:29 -0700)]
Merge "Handle stopping of services with still bound applications."
Josiah Gaskin [Tue, 16 Aug 2011 22:16:04 +0000 (15:16 -0700)]
Fix String16 operator+ to actually work
This change fixes the String16 utility's operator+ function.
Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
Conley Owens [Fri, 12 Aug 2011 20:40:56 +0000 (13:40 -0700)]
Merge "Add missing include" include exists
Amith Yamasani [Fri, 12 Aug 2011 20:16:21 +0000 (13:16 -0700)]
am
4dbd1bc6: am
5f074067: am
712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '
4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
VolumePreference.onActivityStop only stops playback
Conley Owens [Fri, 12 Aug 2011 20:11:51 +0000 (13:11 -0700)]
Merge "Added stub for getting buffer" stub exists
Jeff Brown [Thu, 11 Aug 2011 23:15:31 +0000 (16:15 -0700)]
am
8f226dcb: (-s ours) am
ca97671e: am
6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit '
8f226dcb21c84f5479a0a1b2d6486293dcd2e937':
Fix getSwitchState according to device capabilities.
Jeff Brown [Thu, 11 Aug 2011 23:13:11 +0000 (16:13 -0700)]
am
b4459d8d: (-s ours) am
7e79b9aa: am
dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
b4459d8d6d5377db2494f5a11124d49194f1044c':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846
Jean-Baptiste Queru [Thu, 11 Aug 2011 22:22:42 +0000 (15:22 -0700)]
am
b654e6e5: am
d144748d: Merge "Add missing include"
* commit '
b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
Add missing include
Jean-Baptiste Queru [Thu, 11 Aug 2011 22:18:22 +0000 (15:18 -0700)]
am
d144748d: Merge "Add missing include"
* commit '
d144748d4767b2ccfb13857e23f78bc944e9531d':
Add missing include
Jean-Baptiste Queru [Thu, 11 Aug 2011 20:46:09 +0000 (13:46 -0700)]
Merge "Add missing include"
Jean-Baptiste Queru [Thu, 11 Aug 2011 20:36:04 +0000 (13:36 -0700)]
Add missing include
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
Amith Yamasani [Thu, 11 Aug 2011 19:46:25 +0000 (12:46 -0700)]
am
5f074067: am
712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '
5f07406717db34927f5095de3829b1e74ebd7c16':
VolumePreference.onActivityStop only stops playback
Amith Yamasani [Thu, 11 Aug 2011 19:43:44 +0000 (12:43 -0700)]
am
712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '
712a8cca1f9e438af224f93c3a4644853331af2e':
VolumePreference.onActivityStop only stops playback
Amith Yamasani [Thu, 11 Aug 2011 19:29:34 +0000 (12:29 -0700)]
Merge "VolumePreference.onActivityStop only stops playback"
Jean-Baptiste Queru [Thu, 11 Aug 2011 19:24:51 +0000 (12:24 -0700)]
am
44874c23: am
c962512c: Merge "added stub for getting buffer from surface texture"
* commit '
44874c236de282b0d898f179fc9fdafa84aae40d':
added stub for getting buffer from surface texture
Jean-Baptiste Queru [Thu, 11 Aug 2011 19:19:44 +0000 (12:19 -0700)]
am
c962512c: Merge "added stub for getting buffer from surface texture"
* commit '
c962512cac19e2bb1103c0c1a5f739d40d4d7740':
added stub for getting buffer from surface texture
Jean-Baptiste Queru [Thu, 11 Aug 2011 19:08:04 +0000 (12:08 -0700)]
Merge "added stub for getting buffer from surface texture"
Chris Craik [Thu, 11 Aug 2011 18:56:59 +0000 (11:56 -0700)]
added stub for getting buffer from surface texture
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
Jeff Brown [Wed, 10 Aug 2011 20:59:44 +0000 (13:59 -0700)]
am
ca97671e: am
6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit '
ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
Fix getSwitchState according to device capabilities.
Jeff Brown [Wed, 10 Aug 2011 20:59:41 +0000 (13:59 -0700)]
am
7e79b9aa: am
dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
7e79b9aad85db332d334f8bc1625bf46f030830f':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846
Jeff Brown [Wed, 10 Aug 2011 20:56:33 +0000 (13:56 -0700)]
am
6f5a837c: Merge "Fix getSwitchState according to device capabilities."
* commit '
6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
Fix getSwitchState according to device capabilities.
Jeff Brown [Wed, 10 Aug 2011 20:56:31 +0000 (13:56 -0700)]
am
dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
* commit '
dbff91077ddf437b62794e077d2ce9e10fff8170':
Support wrapping app processes to inject debug instrumentation. Bug:
4437846
Jeff Brown [Wed, 10 Aug 2011 20:42:03 +0000 (13:42 -0700)]
Merge "Fix getSwitchState according to device capabilities."
Jeff Brown [Wed, 10 Aug 2011 20:41:36 +0000 (13:41 -0700)]
Merge "Support wrapping app processes to inject debug instrumentation. Bug:
4437846"
Wink Saville [Thu, 4 Aug 2011 23:11:41 +0000 (16:11 -0700)]
am
090df1dc: Merge "Delay connectivity change notifications." into honeycomb-LTE
* commit '
090df1dc4188e5b9ef10a0aca5081a196085ff56':
Delay connectivity change notifications.
Wink Saville [Thu, 4 Aug 2011 23:10:11 +0000 (16:10 -0700)]
Merge "Delay connectivity change notifications." into honeycomb-LTE
Steve Block [Thu, 4 Aug 2011 21:49:44 +0000 (14:49 -0700)]
am
c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge]
* commit '
c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
Cherry-pick DeviceMotionService CL from master [do not merge]
Gloria Wang [Thu, 4 Aug 2011 21:47:43 +0000 (14:47 -0700)]
am
8a6fb50d: am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)]
am
4e197ea8: am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:33:06 +0000 (14:33 -0700)]
am
e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
* commit '
e15a73ee4c9a28d89888095c7649a70c116ee160':
Bug fixes in OMA DRM v1 Forward Lock Agent
Gloria Wang [Thu, 4 Aug 2011 21:20:53 +0000 (14:20 -0700)]
Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
Xavier Ducrohet [Thu, 4 Aug 2011 19:54:49 +0000 (12:54 -0700)]
am
320834c9: am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
320834c9e02364b39b98b610f1d2244cbb9a4f26':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:52:34 +0000 (12:52 -0700)]
am
b9e8b25e: am
6b3a0123: Merge "Insert a break wraparound."
* commit '
b9e8b25e9066d6f2da0635eaac524246b729fbfa':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:50:11 +0000 (12:50 -0700)]
am
6b3a0123: Merge "Insert a break wraparound."
* commit '
6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
Insert a break wraparound.
Xavier Ducrohet [Thu, 4 Aug 2011 19:36:11 +0000 (12:36 -0700)]
Merge "Insert a break wraparound."
Mike Lockwood [Thu, 4 Aug 2011 14:53:53 +0000 (07:53 -0700)]
am
0b3af353: am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
0b3af353dcf61177158934a11404cf2914038696':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:51:38 +0000 (07:51 -0700)]
am
a82ee49a: am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:48:57 +0000 (07:48 -0700)]
am
8f5dd9ad: Merge "GPS Provider Service changes"
* commit '
8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
GPS Provider Service changes
Mike Lockwood [Thu, 4 Aug 2011 14:39:03 +0000 (07:39 -0700)]
Merge "GPS Provider Service changes"
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)]
am
3a5e36f9: (-s ours) am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:19:05 +0000 (17:19 -0700)]
am
98c531dc: am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
98c531dca9e52af280ca002658bbe38775b3f6ae':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:15:24 +0000 (17:15 -0700)]
am
9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"
* commit '
9b0c6beed2cd5463655712ad80ed160c08611ff8':
Fix a compiling error when trying to use setBufferCount
Jean-Baptiste Queru [Wed, 3 Aug 2011 00:02:48 +0000 (17:02 -0700)]
Merge "Fix a compiling error when trying to use setBufferCount"
Teng-Hui Zhu [Tue, 2 Aug 2011 23:26:41 +0000 (16:26 -0700)]
Fix a compiling error when trying to use setBufferCount
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
Conley Owens [Tue, 2 Aug 2011 20:30:51 +0000 (13:30 -0700)]
am
f8c1f129: am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:24:00 +0000 (13:24 -0700)]
am
e1d27154: am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
e1d271546767a8e2213aabba92506af9e97020b4':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:21:12 +0000 (13:21 -0700)]
am
f87743e7: Merge "Prevent NullPointerException cases while using SipService."
* commit '
f87743e7bdfd10b9a1719036a6320a32df078879':
Prevent NullPointerException cases while using SipService.
Conley Owens [Tue, 2 Aug 2011 20:08:14 +0000 (13:08 -0700)]
Merge "Prevent NullPointerException cases while using SipService."
Jean-Baptiste Queru [Mon, 1 Aug 2011 21:10:39 +0000 (14:10 -0700)]
am
5bb3129c: (-s ours) am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5bb3129c7eabce34d7c1469826e1795d4b225bb3':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:59:02 +0000 (13:59 -0700)]
am
a2616220: am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:55:45 +0000 (13:55 -0700)]
am
5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer."
* commit '
5e57c2cf83ef62e9887592b46a4c3352662fb988':
Stagefright: Return error if codec takes too long to return a buffer.
Jean-Baptiste Queru [Mon, 1 Aug 2011 20:43:07 +0000 (13:43 -0700)]
Merge "Stagefright: Return error if codec takes too long to return a buffer."
Eric Fischer [Mon, 1 Aug 2011 18:19:59 +0000 (11:19 -0700)]
am
f01b3cfa: (-s ours) am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
f01b3cfa9ac2869e3762a90917569186039a9665':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:17:17 +0000 (11:17 -0700)]
am
c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '
c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
Import revised translations. DO NOT MERGE
Eric Fischer [Mon, 1 Aug 2011 18:15:58 +0000 (11:15 -0700)]
Merge "Import revised translations. DO NOT MERGE" into gingerbread
Derek Sollenberger [Fri, 29 Jul 2011 18:24:37 +0000 (11:24 -0700)]
Merge "resolved conflicts for merge of
b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp
Derek Sollenberger [Fri, 29 Jul 2011 18:16:18 +0000 (14:16 -0400)]
resolved conflicts for merge of
b7f09f28 to honeycomb-plus-aosp
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
Robert Greenwalt [Fri, 29 Jul 2011 17:53:16 +0000 (10:53 -0700)]
am
1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
* commit '
1a230885b356256e91b3bf006ec72213ba6f8f76':
Fix NPE when going from proxy to no proxy.
Robert Greenwalt [Fri, 29 Jul 2011 17:51:32 +0000 (10:51 -0700)]
Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
Derek Sollenberger [Fri, 29 Jul 2011 16:53:09 +0000 (09:53 -0700)]
am
b7ed8471: am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
b7ed8471f1b96aff901149cf9ac29e4b32672f93':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:50:11 +0000 (09:50 -0700)]
am
01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."
* commit '
01caec8c4165a6cce2f276f8016b9eadab966944':
Adding an optional param to the SurfaceTexture constructor.
Derek Sollenberger [Fri, 29 Jul 2011 16:43:13 +0000 (09:43 -0700)]
Merge "Adding an optional param to the SurfaceTexture constructor."
Robert Greenwalt [Fri, 29 Jul 2011 16:20:51 +0000 (09:20 -0700)]
am
0d8acea9: Make copy-constructor make deep copy.
* commit '
0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
Make copy-constructor make deep copy.
Derek Sollenberger [Fri, 29 Jul 2011 15:04:51 +0000 (11:04 -0400)]
Adding an optional param to the SurfaceTexture constructor.
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
Michaël Burtin [Fri, 29 Jul 2011 12:25:47 +0000 (14:25 +0200)]
Fix getSwitchState according to device capabilities.
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.
Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
Mike Lockwood [Thu, 28 Jul 2011 21:04:13 +0000 (14:04 -0700)]
am
5f7203eb: am
5a27a754: am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
5f7203eb258503bc5d2ba29176bdf483a68a93b8':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 21:02:14 +0000 (14:02 -0700)]
am
5a27a754: am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
5a27a7543edbd09a56e36d04adb4cfab922e6346':
gps: Adding ip address for AGps
Jeff Brown [Tue, 17 May 2011 00:08:42 +0000 (17:08 -0700)]
Support wrapping app processes to inject debug instrumentation.
Bug:
4437846
Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
Mike Lockwood [Thu, 28 Jul 2011 21:00:27 +0000 (14:00 -0700)]
am
bd1dee94: Merge "gps: Adding ip address for AGps"
* commit '
bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
gps: Adding ip address for AGps
Mike Lockwood [Thu, 28 Jul 2011 20:52:55 +0000 (13:52 -0700)]
Merge "gps: Adding ip address for AGps"
Mike Lockwood [Thu, 28 Jul 2011 20:27:27 +0000 (13:27 -0700)]
am
bf676d46: am
7083ed44: am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
bf676d460d1d1fc8923982006c38d0f6785daea8':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:25:34 +0000 (13:25 -0700)]
am
7083ed44: am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:23:01 +0000 (13:23 -0700)]
am
0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
* commit '
0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
Mike Lockwood [Thu, 28 Jul 2011 20:13:35 +0000 (13:13 -0700)]
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
Wink Saville [Thu, 28 Jul 2011 03:39:09 +0000 (20:39 -0700)]
am
d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
* commit '
d20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
Wink Saville [Thu, 28 Jul 2011 03:35:52 +0000 (20:35 -0700)]
Merge "Support of LTE Only mode" into honeycomb-LTE
Xavier Ducrohet [Thu, 28 Jul 2011 01:40:49 +0000 (18:40 -0700)]
am
0b45ca88: am
cd01ad7c: am
20339b24: Merge "Remove Debug Code"
* commit '
0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:38:50 +0000 (18:38 -0700)]
am
cd01ad7c: am
20339b24: Merge "Remove Debug Code"
* commit '
cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:36:17 +0000 (18:36 -0700)]
am
20339b24: Merge "Remove Debug Code"
* commit '
20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
Xavier Ducrohet [Thu, 28 Jul 2011 01:26:01 +0000 (18:26 -0700)]
Merge "Remove Debug Code"
Ramesh Sudini [Wed, 27 Jul 2011 23:32:48 +0000 (16:32 -0700)]
am
9a87deb5: DataConnection: Clear cid when entering inactive state.
* commit '
9a87deb538caed347621e57c5c83e0185a963bb4':
DataConnection: Clear cid when entering inactive state.
Xavier Ducrohet [Wed, 27 Jul 2011 21:03:35 +0000 (14:03 -0700)]
am
c682559d: (-s ours) am
4d21c773: am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
c682559d3c39aa4503d5c4d60ae046393aa45b79':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 21:01:23 +0000 (14:01 -0700)]
am
4d21c773: am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d21c7732c978a593dfa78f8da1fed7511b38e95':
DO NOT MERGE. may fix build on some version of gcc
Xavier Ducrohet [Wed, 27 Jul 2011 20:59:57 +0000 (13:59 -0700)]
am
4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '
4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
OSDN Git Service
