ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,420 Commits 2 Branches 0 Tags 54 MiB
b9e98d8c6a
Commit Graph

20420 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
cf30ff9ff3 am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread 
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
  wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
 2011-02-02 16:44:55 -08:00
Scott Main
a81c478037 am 4add7f3f: cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera 
* commit '4add7f3ffcebe1564d1e492194817afaf107ac16':
  cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 update OEM driver list with new fujitsu and kyocera
 2011-02-02 16:41:29 -08:00
Scott Main
eba0a98abd Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread 2011-02-02 16:38:25 -08:00
Bill Gruber
22616680c7 am df71cabb: cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs 
* commit 'df71cabbc2f670a4acea91e04f54990a472a56e9':
  cherrypick Change-Id: Ica1b68a1687917432d39d7d116c9c24fa1644a83 Initial posting of in-app billing docs
 2011-02-02 15:46:52 -08:00
Scott Main
599a6ea28d am 2458f2a1: cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent 
* commit '2458f2a1ccf13a9f33c21d8aff260baefac9edb8':
  cherrypick Change-Id: I60c74919ab3df359f47e5052bcc1469318a5b821 add notice about large screen devices and the "mobile" string in user agent
 2011-02-02 15:44:29 -08:00
Scott Main
7238bb6b1a am 0c1a4d3b: cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage 
* commit '0c1a4d3b51337784583ef39378ca8796bb8b0992':
  cherrypick Change-Id: Ia4a3488a7f25925b512c0e0ae64c1f5dcf30f680 fix market link on homepage
 2011-02-02 15:16:13 -08:00
Irfan Sheriff
22e78eb934 resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp 
Change-Id: I294e6e843ae028377d19c1180e0d5e9aef52897c
 2011-02-02 14:23:10 -08:00
Jean-Baptiste Queru
09a107d3d0 am 05059b5b: am 8226140c: Merge from gingerbread 
* commit '05059b5b35ade5957b8dfbb21b09e318a94232ed':
 2011-02-02 09:56:30 -08:00
Jean-Baptiste Queru
3c47c34dee am 8226140c: Merge from gingerbread 
* commit '8226140ccadbc8e0bdd093f8bab0a5292b9224e3':
  fix for supporting 3 digits MNC code
 2011-02-02 09:52:24 -08:00
Jean-Baptiste Queru
9aace938ce am 155b0ee0: Merge from open-source gingerbread 
* commit '155b0ee0498cf863091f3f83a752eaaedf1257f8':
  fix for supporting 3 digits MNC code
 2011-02-02 09:48:52 -08:00
Jean-Baptiste Queru
12801c78e9 Merge from gingerbread 
Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
 2011-02-02 09:47:43 -08:00
Jean-Baptiste Queru
907b884345 Merge from open-source gingerbread 
Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
 2011-02-02 09:45:32 -08:00
Jean-Baptiste Queru
5e06b988ab Merge "fix for supporting 3 digits MNC code" into gingerbread 2011-02-02 09:44:16 -08:00
Eric Laurent
8f1c3ec16c am 3d4069a2: Allow TTY mode for GSM Phones 
* commit '3d4069a2e0c1c23244ead88a177ec06a2ef7a7d1':
  Allow TTY mode for GSM Phones
 2011-02-02 08:28:25 -08:00
Jean-Baptiste Queru
d7fafcc661 am dbf09fee: am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit 'dbf09feee0ba7210dadebbbb4cf7e7248f4ea634':
  Don't crash zygote if webcore fails to load
 2011-02-01 13:12:04 -08:00
Jean-Baptiste Queru
c399c46688 am eb17d6f5: Merge "Don\'t crash zygote if webcore fails to load" 
* commit 'eb17d6f51a9776f02be84859b8980a6317abd27c':
  Don't crash zygote if webcore fails to load
 2011-02-01 13:02:19 -08:00
Jean-Baptiste Queru
32bfd0db82 Merge "Don't crash zygote if webcore fails to load" 2011-02-01 12:41:55 -08:00
Nick Pelly
94e61aeb3f am cbf0983e: Merge "Final final final Gingerbread MR API changes." into gingerbread 
* commit 'cbf0983ec97879026e87fa97ff0b5c8786bfc8f8':
  Final final final Gingerbread MR API changes.
 2011-02-01 10:10:42 -08:00
Nick Pelly
790911fae0 Merge "Final final final Gingerbread MR API changes." into gingerbread 2011-02-01 09:39:31 -08:00
Dianne Hackborn
1737d98863 am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 
* commit '7a7ed2b21233480d63a1f6b3830e3b0c1c6a3298':
  Do not check features in PackageManagerService DO NOT MERGE
 2011-01-31 17:55:11 -08:00
Dianne Hackborn
1059827471 Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread 2011-01-31 17:41:54 -08:00
Eric Fischer
fbe7ad7e1c am a019d15b: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'a019d15b667a72d7cb29afc7f153d5c517abcb76':
  Import revised translations. DO NOT MERGE
 2011-01-31 16:18:27 -08:00
Eric Fischer
1e01e3de0b Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-31 16:08:52 -08:00
Dianne Hackborn
5eb7128198 am e6c6b760: DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode 
* commit 'e6c6b760eb0c1068fdfa656007ec27e482313b58':
  DO NOT MERGE Fix issue #3408542: "resizeable" attribute required to get out of compat mode
 2011-01-31 14:36:02 -08:00
Jean-Baptiste Queru
9d09258217 am a6fb375c: am 056340ac: Merge "stubs" 
* commit 'a6fb375cf727b6ded057110875fe49a9b3f230a3':
  stubs
 2011-01-31 12:03:59 -08:00
Jean-Baptiste Queru
c85d73119c am 056340ac: Merge "stubs" 
* commit '056340ac95f233090990d77266d89aad3b60f913':
  stubs
 2011-01-31 11:55:40 -08:00
Jean-Baptiste Queru
65881cf8b0 Merge "stubs" 2011-01-31 11:32:33 -08:00
Jeff Hamilton
f12dfd3406 am 113834c5: Commit the final API for level 10. 
* commit '113834c5ab30bfc554202d0f3144a662d77f2484':
  Commit the final API for level 10.
 2011-01-31 10:05:13 -08:00
Jean-Baptiste Queru
18f535fad2 am 8a2f3ecc: am 25503f1c: Merge from gingerbread 
* commit '8a2f3ecc030512b6813ee2bb8c56b77280cad7c5':
 2011-01-30 16:26:18 -08:00
Jean-Baptiste Queru
9bfc45e3c3 am e88fa50b: Merge from open-source gingerbread 
* commit 'e88fa50be8d6709ef58b7aeb01c5efa059bcac2e':
  fix failing thread object run
 2011-01-30 16:19:59 -08:00
Jean-Baptiste Queru
842e8a4efb am 25503f1c: Merge from gingerbread 
* commit '25503f1c9f0b5f718052b71dc5b21d1c8576d015':
  fix failing thread object run
 2011-01-30 16:07:25 -08:00
Jean-Baptiste Queru
9a73eb378f Merge from gingerbread 
Change-Id: I017330e0232b317b8bb54e19ab05874b18c83246
 2011-01-30 15:35:17 -08:00
Jean-Baptiste Queru
02bac86968 Merge from open-source gingerbread 
Change-Id: I56f2ed37187796807fbf0de15274a85164f9432c
 2011-01-30 15:30:03 -08:00
Jean-Baptiste Queru
9b1515590c Merge "fix failing thread object run" into gingerbread 2011-01-30 15:17:33 -08:00
Dianne Hackborn
a8eea2f3d9 am a30063d8: am 25eb0464: Merge "Normalize output from aapt d" 
* commit 'a30063d80c08434ac3c7316f338c6d54110449ab':
  Normalize output from aapt d
 2011-01-29 23:04:50 -08:00
Dianne Hackborn
e68d8b8810 am 25eb0464: Merge "Normalize output from aapt d" 
* commit '25eb04642cb5a72f59a274bbfc92f4f65c6c343e':
  Normalize output from aapt d
 2011-01-29 23:01:20 -08:00
Dianne Hackborn
73431999ab Merge "Normalize output from aapt d" 2011-01-29 22:53:20 -08:00
Dianne Hackborn
e0128485a8 am c12cdda9: Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 
* commit 'c12cdda949e6b916dd9e6fa4b30ab8b0d1898faa':
  DO NOT MERGE: Fix screen size compatibility mode.
 2011-01-29 22:30:57 -08:00
Dianne Hackborn
a7ba815307 Merge "DO NOT MERGE: Fix screen size compatibility mode." into gingerbread 2011-01-29 22:20:05 -08:00
Dianne Hackborn
c8d5a70b2c am 2107757d: am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit '2107757dde0b3159119edcc9084fcb9a87985e88':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 15:05:30 -08:00
Dianne Hackborn
695a059c50 am bbb5a5ce: Merge "Make AaptGroupEntry::getMncName accept mnc00" 
* commit 'bbb5a5ce1922a168335811b177cd7341350c15cc':
  Make AaptGroupEntry::getMncName accept mnc00
 2011-01-29 14:59:02 -08:00
Jean-Baptiste Queru
bc790c4ae5 am 1358b6a4: Tweak to make merges easier 
* commit '1358b6a4fb68e81058aa938e46b125350bdf0fff':
  Tweak to make merges easier
 2011-01-29 14:43:33 -08:00
Dianne Hackborn
141ef82df3 Merge "Make AaptGroupEntry::getMncName accept mnc00" 2011-01-29 14:38:48 -08:00
Jean-Baptiste Queru
2409f6b6b0 am 87d19759: Delete browerplugin tests - do not merge 
* commit '87d197597c9130b10ba9d67f17ed81db26e35cd8':
  Delete browerplugin tests - do not merge
 2011-01-29 08:00:52 -08:00
Jean-Baptiste Queru
c461fbc452 am d4c8cec0: am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit 'd4c8cec094dbf7bcfa3f31bedae15e5c65b13e94':
  Delete browerplugin tests - do not merge
 2011-01-29 07:58:36 -08:00
Jean-Baptiste Queru
2512def16d am 9720323a: (-s ours) Merge "Delete browerplugin tests - do not merge" 
* commit '9720323a5138acafbe30da38d61eeac469b675a4':
  Delete browerplugin tests - do not merge
 2011-01-29 07:39:47 -08:00
Robert Greenwalt
5184bce8ae am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread 
* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
 2011-01-29 06:55:38 -08:00
Robert Greenwalt
62e5b62d7f Merge "Add some network types that OEM's are asking for." into gingerbread 2011-01-29 06:38:35 -08:00
Jean-Baptiste Queru
8e543c60f5 stubs 
Change-Id: I829039f3817a172e66eeb9df397e896a488a259d
 2011-01-29 06:19:37 -08:00
Jean-Baptiste Queru
b573eb4453 Merge "Delete browerplugin tests - do not merge" 2011-01-28 15:26:59 -08:00