ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,477 Commits 2 Branches 0 Tags 54 MiB
3f95c7588b
Commit Graph

40477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
3f95c7588b am 960177ae: (-s ours) am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 
* commit '960177ae394a466d765a2dc171e136f9fdea06b6':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
 2011-11-05 19:33:39 +00:00
Dave Burke
50581d6585 am a3af4c94: am 3ee47188: Frame rate to 48 fps 
* commit 'a3af4c94dfbf3336004a38011f6453bfcd7fd638':
  Frame rate to 48 fps
 2011-11-05 19:33:33 +00:00
Mathias Agopian
b077d00714 am 515c6b44: Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1 
* commit '515c6b44d57b829792267594a355cd2831582197':
  fix an issue where SensorService could request an invalid sensor delay
 2011-11-05 19:33:18 +00:00
Irfan Sheriff
91e4897511 am 45a04db3: Merge "Avoid quick shutdown after a driver start" into ics-mr1 
* commit '45a04db3f95755829b24043d30d7da7182b4f33b':
  Avoid quick shutdown after a  driver start
 2011-11-05 19:33:16 +00:00
Narayan Kamath
2d0671b098 am eaa17b76: Merge "Add an API for querying / enabling network TTS support." into ics-mr1 
* commit 'eaa17b768fcd2624cb5d46a76ade24ebe7e56957':
  Add an API for querying / enabling network TTS support.
 2011-11-05 19:33:11 +00:00
Chet Haase
77c09f847b resolved conflicts for merge of aa4d2f69 to master 
Change-Id: Iadb63ecf52d8bd2911276fa3db55a43c9c378620
 2011-11-05 12:01:51 -07:00
Dianne Hackborn
34d145d85f am 55fe6763: Merge "Include showmap output in bug report." into ics-mr1 
* commit '55fe6763d29cb0e899b2541497f4d8bc1bbd14ba':
  Include showmap output in bug report.
 2011-11-05 16:40:10 +00:00
Amith Yamasani
8598650f49 am d69c203c: Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 
* commit 'd69c203cd48c1d0d3be92fb0396656ee8adc1185':
  Close suggestions cursor when SearchView is detached.
 2011-11-05 16:40:07 +00:00
Flavio Lerda
f99fcaf58e am 8f7d88cc: Merge "Add a query parameter to look-up a SIP address." into ics-mr1 
* commit '8f7d88cc67e1c89c960b932ceafc60d378aa2ad6':
  Add a query parameter to look-up a SIP address.
 2011-11-05 16:40:01 +00:00
Eric Laurent
db68ff1d2e resolved conflicts for merge of 914972be to master 
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
 2011-11-05 09:32:35 -07:00
Eric Laurent
67340ae174 Merge "resolved conflicts for merge of 79178b8b to master" 2011-11-05 08:56:06 -07:00
Eric Laurent
69dbcd018d resolved conflicts for merge of 79178b8b to master 
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
 2011-11-05 08:52:20 -07:00
Jeff Brown
343c59cc8d Merge "Slight change to the unwinder API." 2011-11-04 20:06:42 -07:00
Dianne Hackborn
e76a881d78 am ca250167: (-s ours) Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 
* commit 'ca25016775391bf71f7503aeb61798df46fa54cf':
  DO NOT MERGE.  Integrate: Include showmap output in bug report.
 2011-11-04 21:01:40 +00:00
Dianne Hackborn
d0af48a2a4 Merge "DO NOT MERGE. Integrate: Include showmap output in bug report." into ics-mr0 2011-11-04 14:00:21 -07:00
Dave Burke
f11ecc7c72 am 3ee47188: Frame rate to 48 fps 
* commit '3ee471889b09d90affddd00c409a515a64b6861b':
  Frame rate to 48 fps
 2011-11-04 20:55:30 +00:00
Mathias Agopian
d9440fe166 Merge "fix an issue where SensorService could request an invalid sensor delay" into ics-mr1 2011-11-04 12:13:36 -07:00
Irfan Sheriff
9fbfb87f2d Merge "Avoid quick shutdown after a driver start" into ics-mr1 2011-11-04 11:47:27 -07:00
Narayan Kamath
e5a4dc2bb3 Merge "Add an API for querying / enabling network TTS support." into ics-mr1 2011-11-04 11:01:57 -07:00
Chet Haase
a9c23ad3d8 Merge "Improve Launcher drag performance." into ics-mr1 2011-11-04 11:01:25 -07:00
Dianne Hackborn
5a5206c61f Merge "Include showmap output in bug report." into ics-mr1 2011-11-04 10:46:09 -07:00
Amith Yamasani
d4a8083581 Merge "Close suggestions cursor when SearchView is detached." into ics-mr1 2011-11-04 10:41:10 -07:00
Flavio Lerda
47f3f725d0 Merge "Add a query parameter to look-up a SIP address." into ics-mr1 2011-11-04 09:48:18 -07:00
Eric Laurent
e2c4e9ba66 Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:29:30 -07:00
Eric Laurent
44d5fa3aa5 Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1 2011-11-04 08:27:45 -07:00
The Android Open Source Project
71d2a87466 am 8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release 
* commit '8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
  Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
  Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
  Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
  Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
  Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
 2011-11-04 15:01:30 +00:00
The Android Open Source Project
2009c2f06c Reconcile with ics-mr0-release ics-factoryrom-2-release 
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
 2011-11-04 07:56:43 -07:00
Wink Saville
c20a7f1a18 am 9ca0f122: am e4ca9242: Fix the build. 
* commit '9ca0f1222711b4cce1de56c6623790165870392a':
  Fix the build.
 2011-11-04 12:04:09 +00:00
Dave Burke
d40e8d7923 am 43e72b1f: (-s ours) am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 
* commit '43e72b1f5692dd9e220158001317c2abc0ecafcf':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-04 12:04:08 +00:00
Wink Saville
e71d620d70 am 8b771243: am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0 
* commit '8b77124395713de5e09c9b56fac03c244513dc25':
  Separate data stall detection and recovery from net stats.
 2011-11-04 12:04:06 +00:00
Wink Saville
ee0e44271a am e4ca9242: Fix the build. 
* commit 'e4ca92421cc07c2f7f152b774dd1ac7a8944028b':
  Fix the build.
 2011-11-04 11:59:29 +00:00
Dave Burke
14c82e0af9 am 32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0 
* commit '32b5a7eeaf758fad0c24131603cdd54cd2883a58':
  DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
 2011-11-04 11:59:27 +00:00
Wink Saville
e0d02e00bf am 3d708451: Merge "Separate data stall detection and recovery from net stats." into ics-mr0 
* commit '3d7084519b03da0681da13fb8d7d4a0914d11646':
  Separate data stall detection and recovery from net stats.
 2011-11-04 11:59:25 +00:00
Katie McCormick
dc2361e84f am 6d77ad80: am 6c5951bf: Doc change: Updating device-admin with camera info. 
* commit '6d77ad80375a82b97aefb7d5ab547a2944135edf':
  Doc change: Updating device-admin with camera info.
 2011-11-04 11:34:16 +00:00
Katie McCormick
f4af7e7467 am 6c5951bf: Doc change: Updating device-admin with camera info. 
* commit '6c5951bf9798369d335096f1f73ee1299cf903ff':
  Doc change: Updating device-admin with camera info.
 2011-11-04 11:28:39 +00:00
Ken Wakasa
993ec1c38d am 943f6d0b: Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1 
* commit '943f6d0b33f599ed00b76c59b4a4b4c41d0e66f2':
  Turn off the spell checker when the spell checker is disabled in the settings
 2011-11-04 08:05:44 +00:00
Ken Wakasa
6d52d9c26c Merge "Turn off the spell checker when the spell checker is disabled in the settings" into ics-mr1 2011-11-04 01:02:12 -07:00
Dave Burke
e11ccb28d1 Merge "DO NOT MERGE Poll input data with a small timeout and don't consume a full core." into ics-mr0 2011-11-03 21:59:20 -07:00
Wink Saville
de6499254b Merge "Separate data stall detection and recovery from net stats." into ics-mr0 2011-11-03 21:26:35 -07:00
Jeff Brown
2ab79e755b Slight change to the unwinder API. 
Change-Id: I5424de76a21b74842e004e0281936b3f492d3c7a
 2011-11-03 17:30:54 -07:00
Irfan Sheriff
8f260bafc0 am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1 
* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
  Reset IP failure counter on a success
 2011-11-03 23:10:04 +00:00
Irfan Sheriff
c5e0f4ff35 Merge "Reset IP failure counter on a success" into ics-mr1 2011-11-03 16:06:07 -07:00
Christopher Tate
632d904941 am 4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1 
* commit '4fdad1af53ea46892f477185ff93d4182b7aadf9':
  Add persistent property to disable strict mode
 2011-11-03 23:04:43 +00:00
Christopher Tate
59c37194bb Merge "Add persistent property to disable strict mode" into ics-mr1 2011-11-03 15:59:47 -07:00
Mangesh Ghiware
fc109ad55e am 69957172: Merge "Update fix to restore view and text wrap scales." into ics-mr1 
* commit '69957172fa8336e01a9ff07ab34deca2c553f0b4':
  Update fix to restore view and text wrap scales.
 2011-11-03 22:40:56 +00:00
Mangesh Ghiware
233691c340 Merge "Update fix to restore view and text wrap scales." into ics-mr1 2011-11-03 15:35:23 -07:00
Dianne Hackborn
ad2bff5100 am e0ad4746: Merge "Some optimizations for view inflation." into ics-mr1 
* commit 'e0ad47465ededb16c6cd60524acd6941a8ce0bd8':
  Some optimizations for view inflation.
 2011-11-03 22:19:36 +00:00
Dianne Hackborn
fd5178892c Merge "Some optimizations for view inflation." into ics-mr1 2011-11-03 15:16:11 -07:00
Kenny Root
ff2759d80f am e24ac4b2: Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1 
* commit 'e24ac4b219a582f1a99465551b1fd76345553b22':
  Update GET_UNINSTALLED_PACKAGES flag documentation
 2011-11-03 21:51:15 +00:00
Kenny Root
251d5b274f Merge "Update GET_UNINSTALLED_PACKAGES flag documentation" into ics-mr1 2011-11-03 14:47:07 -07:00