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

20454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
c9a4eb08a0 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:19:36 -08:00
Eric Fischer
bb3356d637 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Dirk Dougherty
438a2420b0 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-28 12:00:51 -08:00
Dirk Dougherty
11057a96fd Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Andreas Huber
bf0a277b0b am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-28 10:42:10 -08:00
Eric Laurent
a47aa3b275 am 0ef57993: Merge "Fix issue 2988031." into gingerbread 
* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.
 2011-01-27 18:40:42 -08:00
Eric Laurent
f8edaa87a6 Merge "Fix issue 2988031." into gingerbread 2011-01-27 18:37:04 -08:00
Jim Miller
34eef34406 am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-27 18:25:12 -08:00
Jim Miller
ddccfdc3d4 Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 2011-01-27 18:22:14 -08:00
Nick Pelly
888c243210 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread 
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
 2011-01-27 16:26:28 -08:00
Nick Pelly
d4e1ed1fff Merge "API: Make close() throw an IOException." into gingerbread 2011-01-27 16:23:35 -08:00
Eric Fischer
77ab08c7e7 am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
 2011-01-27 15:00:43 -08:00
Eric Fischer
77c85a0ead Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-27 14:56:29 -08:00
Nick Pelly
1a9e2f471b am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-27 14:12:49 -08:00
Scott Main
d84583f0a6 am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-27 13:29:13 -08:00
Nick Pelly
6c2eb91e37 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread 
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
 2011-01-27 13:25:52 -08:00