ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
42,430 Commits 2 Branches 0 Tags 54 MiB
b29519c601
Commit Graph

42430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Selim Gurun
43f34c4926 Merge "Move ssl callbacks to webcore thread." 2011-12-13 10:25:18 -08:00
Chris Craik
886df7034c Merge "Update tilebenchmark to work with current drawing infrastructure" 2011-12-13 08:53:06 -08:00
Brian Colonna
2b5896dd1d Merge "Changed how Face Unlock coordinates are specified" 2011-12-13 06:38:13 -08:00
The Android Open Source Project
daff3b4b2b am da296533: Reconcile with ics-mr1-release 
* commit 'da29653305f299d6390492333a6360cfa78665d9':
 2011-12-13 05:40:57 -08:00
The Android Open Source Project
fca20c9b5d Reconcile with ics-mr1-release 
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
 2011-12-13 05:11:43 -08:00
Ashish Sharma
812cc587cf Merge "Add a command option to display installerPackageName" 2011-12-13 00:31:53 -08:00
The Android Automerger
0998dbaa26 merge in ics-mr1-release history after reset to ics-mr1 2011-12-12 22:08:59 -08:00
Romain Guy
f0d11c36a3 Merge "Optimize state changes" 2011-12-12 20:36:22 -08:00
Jeff Sharkey
788ccf62aa am f0213bf1: am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0213bf1833e49744b29be97e44c3e9eaad9449d':
  Avoid NPE when missing network stats.
 2011-12-12 20:23:47 -08:00
Jeff Sharkey
149427a372 am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 
* commit 'f0bbc494d638f4c77e688bf9410027f453301559':
  Avoid NPE when missing network stats.
 2011-12-12 20:21:34 -08:00
Jeff Sharkey
b4d1ec8d9d Merge "Avoid NPE when missing network stats." into ics-mr1 2011-12-12 20:19:27 -08:00
Mike Cleron
c5dc4734dd am 3f69fad9: (-s ours) am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '3f69fad9e958f867ceaab9c370b97959e3337c50':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 19:27:36 -08:00
Romain Guy
3ee9c0ff80 Merge "Minimize the amount of data uploaded to draw text" 2011-12-12 19:04:40 -08:00
Romain Guy
6d390a003d Merge "Various OpenGL optimizations" 2011-12-12 19:04:32 -08:00
Mike Cleron
24643b6a70 am 840201d6: Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 
* commit '840201d6e2d7d53e42a31ffeb2ef454982882d12':
  Update VIBRATE_ON to a supported value when upgrading from GB.
 2011-12-12 18:17:46 -08:00
Mike Cleron
ee5de0ffff Merge "Update VIBRATE_ON to a supported value when upgrading from GB." into ics-mr1 2011-12-12 18:15:59 -08:00
Katherine Kuan
b6d614f67a Merge "Add logging to country detector logic" 2011-12-12 18:12:37 -08:00
Dianne Hackborn
3567e61853 am 0ae6e171: am 359bb3b4: Final API 15. 
* commit '0ae6e1719b1fc0aee6e5cf690a7005e975d96df9':
  Final API 15.
 2011-12-12 18:01:26 -08:00
Dianne Hackborn
f9c26a6835 am 2ad8a89b: am a1279586: Merge "SDK only: now that support lib is in SDK, we can link to it." into ics-mr1 
* commit '2ad8a89b4b55f1cf8994e5b044d496d889839403':
  SDK only: now that support lib is in SDK, we can link to it.
 2011-12-12 18:01:22 -08:00
Gilles Debunne
a6e265a2b1 am 8e22ec9b: am a1277de3: Merge "Prevent a memory leak in TextLine." into ics-mr1 
* commit '8e22ec9bc6c59d9e54a6b48f1133881be97af1a7':
  Prevent a memory leak in TextLine.
 2011-12-12 17:49:31 -08:00
Gilles Debunne
e3b3770809 am 7ffadba5: am 1fb90497: Merge "Text blinking cursor hard to see." into ics-mr1 
* commit '7ffadba5dfbeeaa93a9559ca3eaf1a7719426a5f':
  Text blinking cursor hard to see.
 2011-12-12 17:49:29 -08:00
Adam Powell
a799c5b3d4 am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1 
* commit 'bffe0be3af2bd19a392e7d332cbfda9a60b8e057':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
 2011-12-12 17:49:21 -08:00
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