ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,744 Commits 2 Branches 0 Tags 54 MiB
3db323b39a
Commit Graph

33744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
3db323b39a am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit '320834c9e02364b39b98b610f1d2244cbb9a4f26':
  Insert a break wraparound.
 2011-08-04 12:54:49 -07:00
Xavier Ducrohet
480f4bbb2b am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
  Insert a break wraparound.
 2011-08-04 12:52:34 -07:00
Xavier Ducrohet
1966e6faeb am 6b3a0123: Merge "Insert a break wraparound." 
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
  Insert a break wraparound.
 2011-08-04 12:50:11 -07:00
Xavier Ducrohet
a62b24752b Merge "Insert a break wraparound." 2011-08-04 12:36:11 -07:00
Mike Lockwood
f35da8f2e7 am 0b3af353: am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '0b3af353dcf61177158934a11404cf2914038696':
  GPS Provider Service changes
 2011-08-04 07:53:53 -07:00
Mike Lockwood
1631bf5358 am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
  GPS Provider Service changes
 2011-08-04 07:51:38 -07:00
Mike Lockwood
c2c411d9cf am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes
 2011-08-04 07:48:57 -07:00
Mike Lockwood
fca789ba5f Merge "GPS Provider Service changes" 2011-08-04 07:39:03 -07:00
Jean-Baptiste Queru
c23c64c8f0 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
 2011-08-02 17:22:43 -07:00
Jean-Baptiste Queru
6b115451bf 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
 2011-08-02 17:19:05 -07:00
Jean-Baptiste Queru
8fdbdf461a am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '9b0c6beed2cd5463655712ad80ed160c08611ff8':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:15:24 -07:00
Jean-Baptiste Queru
8fdba3dd72 Merge "Fix a compiling error when trying to use setBufferCount" 2011-08-02 17:02:48 -07:00
Teng-Hui Zhu
697bce061c Fix a compiling error when trying to use setBufferCount 
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
 2011-08-02 16:57:20 -07:00
Conley Owens
4f0dfe9a89 am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:30:51 -07:00
Conley Owens
526587bb72 am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:24:00 -07:00
Conley Owens
6662266a42 am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:21:12 -07:00
Conley Owens
b1d918badd Merge "Prevent NullPointerException cases while using SipService." 2011-08-02 13:08:14 -07:00
Jean-Baptiste Queru
2f7b9bf2d1 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.
 2011-08-01 14:10:39 -07:00
Jean-Baptiste Queru
0581cb2681 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.
 2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
46b0fc9b2d 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.
 2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
ae182598a2 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Eric Fischer
45923cdc11 am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:19:59 -07:00
Eric Fischer
c1cf37d145 am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:17:17 -07:00
Eric Fischer
061ad637f7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Derek Sollenberger
9dd6682a5a Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Derek Sollenberger
33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp 
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
 2011-07-29 14:16:18 -04:00
Robert Greenwalt
f9c0f5aa4f 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.
 2011-07-29 10:53:16 -07:00
Robert Greenwalt
4535086245 Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 2011-07-29 10:51:32 -07:00
Derek Sollenberger
bbfbd30383 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:53:09 -07:00
Derek Sollenberger
adbba1fda0 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:50:11 -07:00
Derek Sollenberger
0ed90b7894 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Robert Greenwalt
67020c06fc am 0d8acea9: Make copy-constructor make deep copy. 
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
 2011-07-29 09:20:51 -07:00
Derek Sollenberger
77c988cf4e Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Mike Lockwood
1dc4736a33 am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
  gps: Adding ip address for AGps
 2011-07-28 14:04:13 -07:00
Mike Lockwood
15c8cd406b am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
 2011-07-28 14:02:14 -07:00
Mike Lockwood
7779a44043 am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
 2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Mike Lockwood
94a10fa407 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
 2011-07-28 13:27:27 -07:00
Mike Lockwood
b0e2827bce 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
 2011-07-28 13:25:34 -07:00
Mike Lockwood
956ddf5604 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
 2011-07-28 13:23:01 -07:00
Mike Lockwood
a9b8a0640e Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Wink Saville
a6e07f0018 am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE 
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
  Support of LTE Only mode
 2011-07-27 20:39:09 -07:00
Wink Saville
922649c544 Merge "Support of LTE Only mode" into honeycomb-LTE 2011-07-27 20:35:52 -07:00
Xavier Ducrohet
a5afd4fdd9 am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
  Remove Debug Code
 2011-07-27 18:40:49 -07:00
Xavier Ducrohet
126c631581 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code
 2011-07-27 18:38:50 -07:00
Xavier Ducrohet
7fa726e769 am 20339b24: Merge "Remove Debug Code" 
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code
 2011-07-27 18:36:17 -07:00
Xavier Ducrohet
eff4cc7766 Merge "Remove Debug Code" 2011-07-27 18:26:01 -07:00
Ramesh Sudini
30060f6c76 am 9a87deb5: DataConnection: Clear cid when entering inactive state. 
* commit '9a87deb538caed347621e57c5c83e0185a963bb4':
  DataConnection: Clear cid when entering inactive state.
 2011-07-27 16:32:48 -07:00
Xavier Ducrohet
fba44526c0 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
 2011-07-27 14:03:35 -07:00
Xavier Ducrohet
e32af36b39 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
 2011-07-27 14:01:23 -07:00