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

33674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
66a2eec564 am e612c881: am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit 'e612c881ecf74770098aa9c07d4f0611ac982038':
  Continue idmap generation even if name lookup fails.
 2011-07-25 12:21:06 -07:00
Robert Greenwalt
476ceb890a resolved conflicts for merge of 26ecc31f to honeycomb-plus-aosp 
Change-Id: I23f42e247884f0c9d5ae4d3466213592dd3433d9
 2011-07-25 12:08:19 -07:00
Wink Saville
c2263c2148 am deb62be2: Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 
* commit 'deb62be2e87b19e9bbbc668f8d9327b12dba4a3b':
  Configure RAT dependent retry pattern in GSM DCT.
 2011-07-24 09:13:26 -07:00
Kazuhiro Ondo
743c693bde am 4281817f: Allow suggestedRetryTime to indicate no retry is needed. 
* commit '4281817f6b624cb51926eb24fa78c68cd9431dce':
  Allow suggestedRetryTime to indicate no retry is needed.
 2011-07-24 09:11:42 -07:00
Wink Saville
0785a79c4e Merge "Configure RAT dependent retry pattern in GSM DCT." into honeycomb-LTE 2011-07-24 09:11:28 -07:00
Svetoslav Ganov
f31250adb3 am d1b4c10f: Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE 
* commit 'd1b4c10fedc04384f40ba7fc30115a1380ce014f':
  DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings.
 2011-07-22 17:07:28 -07:00
Svetoslav Ganov
c050ec4512 Merge "DO NOT MERGE AccessibilityInjectorTest did not restore the default key binsings." into honeycomb-LTE 2011-07-22 17:05:26 -07:00
Robert Greenwalt
7e00745cca am ad55d351: Add better routes for secondary DNS 
* commit 'ad55d35114237071133eb28ded93a014185d4e35':
  Add better routes for secondary DNS
 2011-07-22 13:15:56 -07:00
Kazuhiro Ondo
8123f3669c am 1c82f56f: Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME 
* commit '1c82f56f2453a8a7c83090017ab2427a74829b9a':
  Display CSIM SPN only if camping SID/NID matches CSIM CDMAHOME
 2011-07-21 18:15:26 -07:00
Kenny Root
fed1e9021e am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:11:01 -07:00
Kenny Root
2cc4e531f0 am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:09:05 -07:00
Kenny Root
c0e7a06170 Merge "Continue idmap generation even if name lookup fails." 2011-07-21 13:05:03 -07:00
Robert Greenwalt
e164ef4781 am 594745ab: am b9f87f19: Merge "First pass tying into per-interface DNS cache" 
* commit '594745abefe53abe7f577bbb3cc176d52ee00ba1':
  First pass tying into per-interface DNS cache
 2011-07-21 11:29:05 -07:00
Robert Greenwalt
a446055906 am b9f87f19: Merge "First pass tying into per-interface DNS cache" 
* commit 'b9f87f1970217d24213c8e3dd7755a0e4d82f8eb':
  First pass tying into per-interface DNS cache
 2011-07-21 11:28:01 -07:00
Robert Greenwalt
813dac24e4 Merge "First pass tying into per-interface DNS cache" 2011-07-21 11:16:12 -07:00
Xavier Ducrohet
3578bb1b76 am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed':
  Fix to compile for windows
 2011-07-20 18:55:21 -07:00
Xavier Ducrohet
656ddbeb6e am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" 
* commit 'ddb8e3b24b2fe3e4371ca8c1239748f5c71910f6':
  Fix to compile for windows
 2011-07-20 18:53:08 -07:00
Xavier Ducrohet
029c3152d1 am 9bac0a9f: Merge "Fix to compile for windows" 
* commit '9bac0a9f93976ff341fc9c46b3a85be767119a88':
  Fix to compile for windows
 2011-07-20 18:49:46 -07:00
Xavier Ducrohet
dd6656872a Merge "Fix to compile for windows" 2011-07-20 18:35:35 -07:00
Xavier Ducrohet
29c732154d resolved conflicts for merge of ea9e6d24 to honeycomb-plus-aosp 
Change-Id: I8e047147a4d2c899b6654c03a5f32b04d929e602
 2011-07-20 17:45:11 -07:00
Xavier Ducrohet
7ffa22b984 resolved conflicts for merge of 2c311be7 to honeycomb-plus-aosp 
Change-Id: I806c7b4ae95f66df621587e52497dd8739a115fe
 2011-07-20 16:31:25 -07:00
Xavier Ducrohet
2cb8dfb33d am b582af31: am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit 'b582af31c74a58922120fdb747c1a3b867d95e90':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:02:33 -07:00
Xavier Ducrohet
97aaf7cbb9 am 0bc12a0b: Merge "Added Caching for PreProcessed PNGs" 
* commit '0bc12a0b13719976aff95a801d88e48c64510d11':
  Added Caching for PreProcessed PNGs
 2011-07-20 16:00:44 -07:00
Xavier Ducrohet
0d4b0738b5 Merge "Added Caching for PreProcessed PNGs" 2011-07-20 15:55:33 -07:00
Xavier Ducrohet
5c0019bdac am 30824495: am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '3082449508a8c574d0476fdb988f98d9554637ae':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:27:39 -07:00
Xavier Ducrohet
99f603397f am 1e24ccbd: Merge "Add generation of dependency file for .ap_ package" 
* commit '1e24ccbdd56a45c8bb5f2eba94af5aecd2d02554':
  Add generation of dependency file for .ap_ package
 2011-07-20 15:23:55 -07:00
Xavier Ducrohet
6e068693b3 Merge "Add generation of dependency file for .ap_ package" 2011-07-20 15:08:23 -07:00
Wink Saville
0fdf095f09 am f679d4cb: Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE 
* commit 'f679d4cb92b6d1c193a154abb5ae8fb3a786fc43':
  Fix FeatureUser leak in ConnectivityService
 2011-07-19 12:39:42 -07:00
Kazuhiro Ondo
d60ef94382 am bf361b59: Return IMEI SV if CDMA-LTE mode is used 
* commit 'bf361b59e4e6c1c7c710e73260a77e9937f1fb59':
  Return IMEI SV if CDMA-LTE mode is used
 2011-07-19 12:39:39 -07:00
Wink Saville
86f04483d2 Merge "Fix FeatureUser leak in ConnectivityService" into honeycomb-LTE 2011-07-19 12:37:18 -07:00
Xavier Ducrohet
06d0fdd825 am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:18:28 -07:00
Xavier Ducrohet
0044cffa75 am d5431ed5: am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit 'd5431ed5505a42e5e33c8bf7cc2ff72792979be9':
  Copy once-created R.java into library projects
 2011-07-19 10:18:25 -07:00
Xavier Ducrohet
a3563e8f8c am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit '82943ecfe2c4266cf3db50326240825fefcaa38f':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:15:11 -07:00
Xavier Ducrohet
0092886a15 am 2e659ae5: am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '2e659ae59c17a0c0584d35b8c400a294c9d49e12':
  Copy once-created R.java into library projects
 2011-07-19 10:15:09 -07:00
Xavier Ducrohet
dae75dd7d5 am d40c93f6: Merge "Add dependency generation to Aapt for R.java" 
* commit 'd40c93f61ca5b3f2351b8db716f67b58f1625e85':
  Add dependency generation to Aapt for R.java
 2011-07-19 10:10:17 -07:00
Xavier Ducrohet
e74c354c7e am 42755155: Merge "Copy once-created R.java into library projects" 
* commit '42755155d6e8ddc3201b08def2bf262a64fa25f2':
  Copy once-created R.java into library projects
 2011-07-19 10:10:15 -07:00
Xavier Ducrohet
166845ba93 Merge "Add dependency generation to Aapt for R.java" 2011-07-19 10:03:16 -07:00
Xavier Ducrohet
c6c26cd7ec Merge "Copy once-created R.java into library projects" 2011-07-19 10:03:05 -07:00
Wink Saville
e5b9400b84 am cd4636ec: Add LteOnCdmaDevice system property. 
* commit 'cd4636ec08a50ab890acab0cf0c3c3f07f91896a':
  Add LteOnCdmaDevice system property.
 2011-07-18 18:39:41 -07:00
Conley Owens
83937f38f0 am a4aef41a: am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'a4aef41a74a69b0296b88361ffb33d0470a26362':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:55:33 -07:00
Conley Owens
60f8195edc am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:53:41 -07:00
Conley Owens
61d3cf3bfa am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16" 
* commit '4d8f6a38e7268e29e189cb4173f42c7aa5b320a3':
  stagefright aacenc: Mark codeWord as UWord16
 2011-07-18 16:52:26 -07:00
Conley Owens
0d0cbd3d03 Merge "stagefright aacenc: Mark codeWord as UWord16" 2011-07-18 16:49:43 -07:00
Deckard Autoverifier
c2c84e91b2 am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '2acddc54e1e7a9f41b4b5acc2e8984c46539425a':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:44:03 -07:00
Deckard Autoverifier
fb8bca5cda am 31140598: am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '31140598866c668047fc6dede7944e146aa21a0a':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:44:01 -07:00
Deckard Autoverifier
6ec08140b2 am 29fd8cdb: am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '29fd8cdbe554ca65c57dd9eea59dc57e3392acc3':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:43:58 -07:00
Deckard Autoverifier
2139600b7e am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '691257b1812ffd8172b01c17b9ba23a48eb76594':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:43:54 -07:00
Deckard Autoverifier
4161a0125e am 89bac182: am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '89bac1820f3788d655ae293ec9a65c18226e09ee':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:41:31 -07:00
Deckard Autoverifier
190218df66 am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit '16db83c26442f5e25b6aad77a37b612fa0be9862':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:41:29 -07:00
Deckard Autoverifier
9781293261 am 80ef1745: am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit '80ef1745d00c235b117e389e56e58210cf88e5c8':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:41:26 -07:00