ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
42,508 Commits 2 Branches 0 Tags 54 MiB
41338ae6ad
Commit Graph

42508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
76cc3dfcff am 359bb3b4: Final API 15. 
* commit '359bb3b432b21590c12588c3ca3880ac17aadc96':
  Final API 15.
 2011-12-12 17:04:04 -08:00
Irfan Sheriff
53186ed93c Merge "Fix configured network status" 2011-12-12 16:55:49 -08:00
Romain Guy
64f3903723 Merge "Remove leftover debugging code" 2011-12-12 16:50:55 -08:00
Romain Guy
8d3aacec3a Merge "Keep shaders to render properly" 2011-12-12 16:49:40 -08:00
Dianne Hackborn
38478c79f5 am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit 'a1279586dd1a866dd58d669aa0980d71f6c589d9':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 16:12:40 -08:00
Jamie Gennis
ace62f2b79 am 74e0fcae: am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit '74e0fcaed1cd20ae8632224ff5a5404ff1a6e497':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 16:10:28 -08:00
Dianne Hackborn
ff934866fc Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 2011-12-12 16:09:54 -08:00
Gilles Debunne
c8283d35ee am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit 'a1277de3c393fb0861d26ec5551ae4247e32dee4':
  Prevent a memory leak in TextLine.
 2011-12-12 15:56:33 -08:00
Gilles Debunne
7d4454cfd5 am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '1fb90497b73b1560c55f1cb73cd394c3b8714212':
  Text blinking cursor hard to see.
 2011-12-12 15:54:38 -08:00
Gilles Debunne
8754c8f146 Merge "Prevent a memory leak in TextLine." into ics-mr1 2011-12-12 15:53:25 -08:00
Gilles Debunne
8d1381027d Merge "Text blinking cursor hard to see." into ics-mr1 2011-12-12 15:52:39 -08:00
Adam Powell
42fa6012c0 am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit '9c92fcd91c67a98f3a767255e7d3748bca3ef751':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 15:42:22 -08:00
Adam Powell
3786085f8e Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 2011-12-12 15:40:00 -08:00
Raphael
57f827dd76 am ab8d6785: (-s ours) am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit 'ab8d6785dcefa5b2b66f6c042475a0f9f558dd45':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 15:39:30 -08:00
Matthew Xie
25e4ab78aa am 18ad6514: am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 15:39:27 -08:00
Eric Fischer
84e37b25ca am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
  Import revised translations.  DO NOT MERGE
 2011-12-12 15:39:23 -08:00
The Android Open Source Project
0f11d886bf am 40375099: Reconcile with ics-mr1-release 
* commit '40375099d10139b6c96c1db8b8295874d60c712e':
 2011-12-12 15:39:19 -08:00
The Android Open Source Project
61d9c58c85 am f14dc291: Merge from ics-mr1 
* commit 'f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
  Fix drm enumeration order, resolves failure to play forward lock ringtones
 2011-12-12 15:39:17 -08:00
Irfan Sheriff
313a4b4d1d Merge "Clean up synchronization" 2011-12-12 15:35:25 -08:00
Justin Ho
5efc534ed2 am df83cfc9: am 1cec30a1: Merge "Quick settings icons updated to match ics style on tablet" into ics-mr1 
* commit 'df83cfc95c1b909ffcfc31f3dd30262a49cffced':
  Quick settings icons updated to match ics style on tablet
 2011-12-12 15:30:36 -08:00
Jeff Tinker
889fd1bc86 am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:30:16 -08:00
Joe Fernandez
621cb6715c am a4f49ac5: am 4b3227de: am 89c3bc38: Merge "docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6" into ics-mr0 
* commit 'a4f49ac5284d7ab97e56e318523652f35d9de0d6':
  docs: Android 4.0.2 (SDK Tools r16) Release Notes - RC6
 2011-12-12 15:30:14 -08:00
Gilles Debunne
e5d55e7f94 am f107abec: am caf4ead3: Merge "Blinking cursor in Talk" into ics-mr1 
* commit 'f107abec56811dea1ae81c6abc78a68e433c1080':
  Blinking cursor in Talk
 2011-12-12 15:30:10 -08:00
The Android Open Source Project
29f50c0b6f am 175d5d76: Reconcile with ics-mr1-release 
* commit '175d5d76b0aa9808b4214522a6fdf461109560ec':
 2011-12-12 15:29:56 -08:00
James Dong
c77a7307e6 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.
 2011-12-12 15:29:46 -08:00
Gilles Debunne
b0332ef11a resolved conflicts for merge of 1742f20c to master 
Change-Id: I02d84edfe8cc0b71881884ecec21f831404aa555
 2011-12-12 15:16:42 -08:00
Jamie Gennis
51ce74df34 am a1dee3f5: Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 
* commit 'a1dee3f500eccedbf5e50d466315fb28ba812cfc':
  SurfaceTexture: fix a verbose-log compile error
 2011-12-12 14:12:33 -08:00
Jamie Gennis
07584d6321 Merge "SurfaceTexture: fix a verbose-log compile error" into ics-mr1 2011-12-12 14:10:04 -08:00
Robert Greenwalt
b947b40f21 Merge "Use the carrier-given dns addrs for tethering." 2011-12-12 14:02:02 -08:00
Raphael
65e3a8c971 am 2ace3b01: Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 
* commit '2ace3b01ab9447ce9fda2f578e31c1c11f4837cb':
  Merge "AAPT fix printf %zd crash on Windows". Do not merge.
 2011-12-12 13:16:35 -08:00
Gilles Debunne
0bc83f24f0 am afa0a714: am df372289: Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1 
* commit 'afa0a714acb45e90bdda3fd72b529a817a25f2d1':
  Fixed SpellCheckerSessions leak in TextView
 2011-12-12 13:15:53 -08:00
Gilles Debunne
df7e6c5f4f am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1 
* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine
 2011-12-12 13:15:46 -08:00
Joe Malin
aa932891f5 am 8e94d912: am 556e4ca5: am 0a9005ed: Merge "DOC CHANGE: Package text and Formatter javadoc" into ics-mr0 
* commit '8e94d912c6e0fc3c6d5e992b6559a0efc20372be':
  DOC CHANGE: Package text and Formatter javadoc
 2011-12-12 13:15:36 -08:00
Chia-chi Yeh
168eaf1481 am fa71962f: am 46a4e81d: Merge "VPN: delete the "abort" file before starting VPN daemons." into ics-mr1 
* commit 'fa71962fe4595f484071ac0deb23f68d44932d83':
  VPN: delete the "abort" file before starting VPN daemons.
 2011-12-12 13:15:34 -08:00
Raphael
afcfa2f23a Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1 2011-12-12 13:14:12 -08:00
Irfan Sheriff
568a6fce2a am c34306e4: am 97ff7893: Merge "Fix wifi bring up at boot up" into ics-mr1 
* commit 'c34306e46e0f53a9478216c2d5fd3129a3bc6f8e':
  Fix wifi bring up at boot up
 2011-12-12 12:35:12 -08:00
Jake Hamby
49a5fc6c4d am 555fe79c: am c40f70a5: Merge "Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines." into ics-mr1 
* commit '555fe79cdf037e7250f04591e60ecc8cff0cb95e':
  Swap OK and Cancel buttons in SIM PIN unlock screen to match ICS guidelines.
 2011-12-12 12:35:09 -08:00
Matthew Xie
ecc1b9a994 am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
 2011-12-12 12:09:13 -08:00
Matthew Xie
027bd44923 Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1 2011-12-12 12:07:39 -08:00
Romain Guy
9e212ebc0f Merge "Code cleanup" 2011-12-12 11:44:43 -08:00
Romain Guy
d3e5f4e5df Merge "Free up resources by deleting shaders early on" 2011-12-12 11:44:32 -08:00
Eric Fischer
44644a1666 am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '386f208489d85d81755b64e92a84290953accfc0':
  Import revised translations.  DO NOT MERGE
 2011-12-12 11:06:38 -08:00
Eric Fischer
0beca4d419 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-12-12 11:04:39 -08:00
Amith Yamasani
f074f7e101 Merge "Show the current stream's volume in the volume panel." 2011-12-12 09:56:26 -08:00
Andreas Huber
fc829f73a0 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
The Android Open Source Project
6952dcd51d Reconcile with ics-mr1-release 
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
 2011-12-12 07:59:17 -08:00
The Android Open Source Project
02f2cff12c Merge from ics-mr1 
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
 2011-12-12 07:47:43 -08:00
Ben Murdoch
ddf9a54596 Merge "Clear the WebView picture when a new load starts." 2011-12-12 03:13:46 -08:00
Makoto Onuki
a5c08d1157 Merge "MCC detection fixes for CountryDetector" 2011-12-10 13:23:59 -08:00
Andreas Huber
6ddc5e610f am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00