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

33804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Deckard Autoverifier
1a2e048221 am 68e37dac: am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '68e37dacc065eebb971d443722b7a8413ff403d6':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:41:24 -07:00
Deckard Autoverifier
07f2ce413a am 88409911: Merge "stagefright: Include stdlib.h for malloc/free" 
* commit '88409911aebed6c3663e51d51fca67f527c0c2fb':
  stagefright: Include stdlib.h for malloc/free
 2011-07-18 15:38:30 -07:00
Deckard Autoverifier
b54c227775 am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file" 
* commit 'eb07c531498f4dc881ad2b4d1a32cacab25950ff':
  stagefright amrwbenc: Remove a duplicate, unused file
 2011-07-18 15:38:27 -07:00
Deckard Autoverifier
2be5cc29df am c06c3603: Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 
* commit 'c06c3603e09a85136eb97d1d8ba1a49fcebae93b':
  stagefright aacenc: Make the mem_malloc function 64-bit safe
 2011-07-18 15:38:25 -07:00
Deckard Autoverifier
c4bb45511c am 55f115a3: Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 
* commit '55f115a3214343c826acf27fcbc4bf2927049083':
  stagefright: Only use __int64 on MSVC, not on all win32 compilers
 2011-07-18 15:38:22 -07:00
Deckard Autoverifier
fde808cbb3 Merge "stagefright: Include stdlib.h for malloc/free" 2011-07-18 15:23:41 -07:00
Deckard Autoverifier
e51e21c863 Merge "stagefright amrwbenc: Remove a duplicate, unused file" 2011-07-18 15:23:31 -07:00
Deckard Autoverifier
1ae41e21dc Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe" 2011-07-18 15:23:20 -07:00
Deckard Autoverifier
605aac1879 Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers" 2011-07-18 15:23:09 -07:00
Conley Owens
5ce26add5b am 45ddd425: am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '45ddd42544167494cee7213ecddcb6f8057c86c0':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:47:50 -07:00
Conley Owens
8c5dd0061d am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:44:57 -07:00
Conley Owens
4b1d4a7ac3 am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 
* commit '98fcc4041d35831c7a65a6e2f0e61021e0fb37e2':
  stagefright aacenc/amrwbenc: Remove trailing whitespace
 2011-07-18 12:42:42 -07:00
Conley Owens
9569289a8d Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" 2011-07-18 12:37:16 -07:00
Nick Pelly
5b9b4ebf78 am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread 
* commit '1bce9e25b6979780d849096059ef73507bdda250':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
 2011-07-15 10:47:10 -07:00
Robert Greenwalt
5812538e90 am 476f5525: Small fix to 5008973 fix. 
* commit '476f55253adc670d7290ad8c90b5adc9e4f58d3b':
  Small fix to 5008973 fix.
 2011-07-15 10:20:48 -07:00
Robert Greenwalt
b4bd2daedd resolved conflicts for merge of 0a46db5d to honeycomb-plus-aosp 
Change-Id: I0f1bea54d999ab3ef10400ee67bd4d3b2a5d1783
 2011-07-15 09:55:48 -07:00
John Wang
76652989ac am 54b2a326: Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 
* commit '54b2a3262738cdb3d0df747d8719e9a3cac33dfc':
  Show SIM blocked after 10 time puk wrong entries.
 2011-07-14 14:00:58 -07:00
John Wang
1acde887d5 Merge "Show SIM blocked after 10 time puk wrong entries." into honeycomb-LTE 2011-07-14 13:59:10 -07:00
Nick Pelly
4fa5dc52c0 am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread 
* commit '01588acaf87cfe9916239b7b26cc6810e0097138':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
 2011-07-13 22:38:44 -07:00
Wink Saville
91249c1ef7 am 6d1d16c3: Merge "Remove STOPSHIP but allow seamless Handoff when possible." into honeycomb-LTE 
* commit '6d1d16c324a681dd966d47497a71a02eac512234':
  Remove STOPSHIP but allow seamless Handoff when possible.
 2011-07-13 14:19:12 -07:00