ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity
41,095 Commits 2 Branches 0 Tags 54 MiB
bdfa931022
Commit Graph

41095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Sandler
a6e18fc3de Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1 2011-11-29 05:49:11 -08:00
Yu Shan Emily Lau
ef56d02fe9 am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 
* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
  Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
 2011-11-28 19:55:27 -08:00
Yu Shan Emily Lau
907e5e7c09 Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 2011-11-28 19:53:58 -08:00
Christopher Tate
b4b54368c3 am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 
* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
  Add iteration-limited mode to FrameworkPerf
 2011-11-28 17:58:25 -08:00
Christopher Tate
203e95eef8 Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 2011-11-28 17:56:18 -08:00
Xia Wang
5ee38d25d7 am e5715521: am 2d9f4620: Fix build 
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build
 2011-11-28 16:57:14 -08:00
Dianne Hackborn
bfdb7b36bd am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1 
* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
  Fix issue #5588689: Black camera preview after coming back from gmail
 2011-11-28 16:55:05 -08:00
Xia Wang
efba5b5674 am 2d9f4620: Fix build 
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
  Fix build
 2011-11-28 16:53:50 -08:00
Dianne Hackborn
7aa0d8fb3d Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1 2011-11-28 16:53:00 -08:00
Romain Guy
7a6b56de94 am 46685db9: Merge "Fix crash in existing applications Bug #5659476" into ics-mr1 
* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
  Fix crash in existing applications Bug #5659476
 2011-11-28 16:08:52 -08:00
Romain Guy
30d5c55ee7 Merge "Fix crash in existing applications Bug #5659476" into ics-mr1 2011-11-28 16:06:52 -08:00
Xia Wang
7f800e1f7a am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0 
* commit 'da822367886d68f997153c7edd5368f3dfb6d58d':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
 2011-11-28 16:04:39 -08:00
Xia Wang
5c71c805c5 am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0 
* commit '25261f59af0d902f239e541b735f7dc31e714b07':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
 2011-11-28 16:02:44 -08:00
Xia Wang
0969e94791 Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0 2011-11-28 16:00:49 -08:00
Chet Haase
9ad4b15c32 am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1 
* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
  Fix flashing wifi dialog after rotating back from landscape.
 2011-11-28 15:45:32 -08:00
Chet Haase
a44370e22b Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1 2011-11-28 15:43:23 -08:00
Eric Rowe
fdf761ba4b am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1 
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.
 2011-11-28 14:26:39 -08:00
Eric Rowe
1d6410bcaf Merge "Fix SCO start stop tests." into ics-mr1 2011-11-28 12:32:34 -08:00
Narayan Kamath
8b79bb0049 am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1 
* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
  Fix TTS instantiation from webview accessibility handlers.
 2011-11-28 10:39:07 -08:00
Narayan Kamath
50db512db6 Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1 2011-11-28 10:36:32 -08:00
Derek Sollenberger
ac5e36c87d am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1 
* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
  Update Webkit with the zoom level after double tap gesture
 2011-11-28 10:35:57 -08:00
Derek Sollenberger
7dea1f9e3e Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1 2011-11-28 10:34:04 -08:00
Ben Murdoch
54749d0da1 am 2ffc9ec3: Ensure we dismiss the <select> option dialog. 
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.
 2011-11-28 10:33:48 -08:00
Narayan Kamath
593e3ffd14 am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1 
* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
  Fix regressions in TTS completion callbacks.
 2011-11-24 09:40:04 -08:00
Narayan Kamath
8c65dea758 Merge "Fix regressions in TTS completion callbacks." into ics-mr1 2011-11-24 09:38:15 -08:00
Irfan Sheriff
a9c39f5924 am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1 
* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi
 2011-11-23 19:19:56 -08:00
Irfan Sheriff
1f13f84cea Merge "Fix tethering interaction from wifi" into ics-mr1 2011-11-23 19:18:22 -08:00
John Wang
9b34f131f6 am e95f4986: Merge "Fix a build break." into ics-mr1 
* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.
 2011-11-23 16:50:04 -08:00
John Wang
0f20328ac0 Merge "Fix a build break." into ics-mr1 2011-11-23 16:48:32 -08:00
Adam Cohen
f4637eae61 am 8ce22f26: Fixing a typo in framework widget padding 
* commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
  Fixing a typo in framework widget padding
 2011-11-23 16:41:01 -08:00
John Wang
162350f9a6 am 9b108009: Check watingApns before access it. 
* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.
 2011-11-23 15:37:20 -08:00
Mathias Agopian
b8bb31dc10 temporarily hardcode Nexus S refresh rate 
Change-Id: Id8465f679b96636041b4b891d0b358c387d456c3
 2011-11-23 14:51:09 -08:00
Eric Laurent
4142a7a768 am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun
 2011-11-23 12:32:53 -08:00
Eric Laurent
ae170f664c Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00
Michael Chan
e5b9ade306 am 37ac88f9: Merge "Update description of account_type" into ics-mr1 
* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type
 2011-11-23 12:14:16 -08:00
Michael Chan
029d707b4b Merge "Update description of account_type" into ics-mr1 2011-11-23 12:12:51 -08:00
Robert Greenwalt
5daf4272d4 am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1 
* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.
 2011-11-23 11:27:06 -08:00
Robert Greenwalt
252b763217 Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Owen Lin
bbcf8d3948 am 8bb56180: Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 
* commit '8bb56180d208b9264e5a56b49fe06b8471ccaced':
  Fix 5654631. It forgot to consider the year in formatDateRange.
 2011-11-22 17:46:35 -08:00
Owen Lin
0f644e5257 Merge "Fix 5654631. It forgot to consider the year in formatDateRange." into ics-mr1 2011-11-22 17:44:52 -08:00
The Android Open Source Project
4273a3e0c3 am 1889bb49: Reconcile with ics-mr0-release 
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
 2011-11-22 15:26:16 -08:00
The Android Open Source Project
0922394b74 Reconcile with ics-mr0-release 
Change-Id: Ib84a053208dd4deae9bfe04e185ab2cec4728864
 2011-11-22 15:24:04 -08:00
The Android Open Source Project
82ac0ee5bc am 27239099: Reconcile with ics-mr0-release 
* commit '2723909903b68db016666a13ec897581a8915636':
 2011-11-22 15:16:08 -08:00
The Android Open Source Project
46dbb9b634 Reconcile with ics-mr0-release 
Change-Id: I0b5b295a6fc0e4e7978ce11905c3cffd0e07f7e1
 2011-11-22 15:14:10 -08:00
The Android Automerger
5ac81863de merge in ics-mr0-release history after reset to ics-mr0 2011-11-22 14:28:06 -08:00
dujin.cha
f47588cbb7 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue 
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
 2011-11-22 13:20:09 -08:00
dujin.cha
94b093c607 am fe464a76: [Prime K] Fix gabage character issue 
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
 2011-11-22 13:18:27 -08:00
Jean-Baptiste Queru
b420ff334a am eff6ed0f: Ignore e36657e5 
* commit 'eff6ed0fee42e4324ceb8d5a20be09bb2f34aa9f':
  Do not merge. Fix a memory leak of a Binder in SpellCheckerService
 2011-11-22 13:18:05 -08:00
Jean-Baptiste Queru
502a9c95c8 Ignore e36657e5 
Change-Id: I93632b881f8c5231a521863cb4a8f05d81ea8ada
 2011-11-22 13:15:31 -08:00
Romain Guy
ad7e6ffdad am 303a0695: Merge "Draw in the correct FBO after invoking a GL functor Bug #5650514" into ics-mr1 
* commit '303a0695b8fa0b8f0095c437145a28633a7a8d92':
  Draw in the correct FBO after invoking a GL functor Bug #5650514
 2011-11-22 12:35:25 -08:00