1. 3562931 resolved conflicts for merge of 05683c85 to master by Eric Laurent · 15 years ago
  2. 6808516 Merge "Add units to time periods" by Glenn Kasten · 15 years ago
  3. f4a93d0 Merge "Use const const strings for arrays and pointers to strings" by Glenn Kasten · 15 years ago
  4. 0d7a997 Merge "For booleans, use ! instead of == false" by Glenn Kasten · 15 years ago
  5. 22c4241 Add units to time periods by Glenn Kasten · 15 years ago
  6. 05d3310 Use const const strings for arrays and pointers to strings by Glenn Kasten · 15 years ago
  7. 6de74ff Fix edge cases leading to backup hanging forever by Christopher Tate · 15 years ago
  8. b737dbb For booleans, use ! instead of == false by Glenn Kasten · 15 years ago
  9. 71c4496 AudioFlinger: mix track only when really ready (2) by Eric Laurent · 15 years ago
  10. 540c35f Merge "Track volume cleanup" by Glenn Kasten · 15 years ago
  11. 1be4afe Merge "audio framework: manage stream volume per device" by Eric Laurent · 15 years ago
  12. 0632bad Track volume cleanup by Glenn Kasten · 15 years ago
  13. 9bc8358d audio framework: manage stream volume per device by Eric Laurent · 15 years ago
  14. 8df3308 Remove dead setVolume() and mVolume[2] by Glenn Kasten · 15 years ago
  15. fb6b5bd Merge "Use audio_mode_t consistently" by Glenn Kasten · 15 years ago
  16. 6e987a4 Check stream type in AudioFlinger::createTrack by Glenn Kasten · 15 years ago
  17. c80f407 Merge "Fix locking for mMasterVolume and mMute" by Glenn Kasten · 15 years ago
  18. 8c17a2f Merge "Use size_t for frame size" by Glenn Kasten · 15 years ago
  19. 3c6b9cc Merge "Use audio_stream_type_t consistently" by Glenn Kasten · 15 years ago
  20. dd3ca2e Merge "AudioTrack and AudioFlinger send level cleanup" by Glenn Kasten · 15 years ago
  21. e6f8a42 Fix locking for mMasterVolume and mMute by Glenn Kasten · 15 years ago
  22. 4790bd8 AudioTrack and AudioFlinger send level cleanup by Glenn Kasten · 15 years ago
  23. dfef199 Merge "Fix a few memory leaks in the input dispatcher." by Jeff Brown · 15 years ago
  24. faf354d Use size_t for frame size by Glenn Kasten · 15 years ago
  25. 1e80869 Get AID_GRAPHICS from right place by Glenn Kasten · 15 years ago
  26. f88d149 am 10065177: am 2e282f35: Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 by Dianne Hackborn · 15 years ago
  27. 2e282f3 Merge "Fix issue #5823276: home repaints after full-screen app is exited" into ics-mr1 by Dianne Hackborn · 15 years ago
  28. ecce05f am 89620c5d: am 2cf18d28: Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 by Christopher Tate · 15 years ago
  29. 2cf18d2 Merge "Streamline package-installed handling by the Backup Manager" into ics-mr1 by Christopher Tate · 15 years ago
  30. bc1d77b Use audio_stream_type_t consistently by Glenn Kasten · 15 years ago
  31. 6a78cd8 Merge "Move where prop dev.bootcomplete is set" by Guang Zhu · 15 years ago
  32. a8f75fe Merge "fix a bug with vsync management" by Mathias Agopian · 15 years ago
  33. c0cb3dc Fix a few memory leaks in the input dispatcher. by Jeff Brown · 15 years ago
  34. 191713a Move where prop dev.bootcomplete is set by Guang Zhu · 15 years ago
  35. 0bacfd2 Streamline package-installed handling by the Backup Manager by Christopher Tate · 15 years ago
  36. 87c6ea6 fix a bug with vsync management by Mathias Agopian · 15 years ago
  37. 5d13434 am 1e9e7f76: am ff321d49: Merge "VPN: silence VPN notifications." into ics-mr1 by Chia-chi Yeh · 15 years ago
  38. ff321d49 Merge "VPN: silence VPN notifications." into ics-mr1 by Chia-chi Yeh · 15 years ago
  39. 01b02a7 Fix issue #5823276: home repaints after full-screen app is exited by Dianne Hackborn · 15 years ago
  40. 2fdc357 Merge "remove dead/usnused code" by Mathias Agopian · 15 years ago
  41. 3adbec2 Merge "Fix an issue with VSYNC" by Mathias Agopian · 15 years ago
  42. accb114 Use audio_mode_t consistently by Glenn Kasten · 15 years ago
  43. cc98580 am 1800ccfa: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 by Robert Greenwalt · 15 years ago
  44. 4b1261f Merge "Disable wimax when mobile data is in Settings" into ics-mr1 by Robert Greenwalt · 15 years ago
  45. 0db7590 remove dead/usnused code by Mathias Agopian · 15 years ago
  46. 7e9a370 Fix an issue with VSYNC by Mathias Agopian · 15 years ago
  47. 50fe709 VPN: silence VPN notifications. by Chia-chi Yeh · 15 years ago
  48. 1eac460 Merge "Simplify range check for audio_mode_t" by Glenn Kasten · 15 years ago
  49. 88ef0a7 Merge "Use correct type for hardware call state" by Glenn Kasten · 15 years ago
  50. ca61ea8 Merge "Use consistent style of & reference for AutoMutex" by Glenn Kasten · 15 years ago
  51. 482b9c2 Merge "AudioFlinger new can't fail" by Glenn Kasten · 15 years ago
  52. bb8d6fb Merge "Fix build warning" by Glenn Kasten · 15 years ago
  53. c369056 Enable subtypes when the implicitly enabled subtype is not ascii capable keyboard by satok · 15 years ago
  54. 2cc28de Merge "Move non-monotonic reporting to interface." by Jeff Sharkey · 15 years ago
  55. 5a7bcf3 Move non-monotonic reporting to interface. by Jeff Sharkey · 15 years ago
  56. 01aaf2c Simplify range check for audio_mode_t by Glenn Kasten · 15 years ago
  57. de7a2f3 DO NOT MERGE - Cherry picking from master to MR1 by Danielle Millett · 15 years ago
  58. ec193de Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE by Steve Block · 15 years ago
  59. 4e71914 Merge "By convention const goes before the type specifier" by Glenn Kasten · 15 years ago
  60. 26f260a Use cached reference to media.player service by Glenn Kasten · 15 years ago
  61. 07d7d5a Merge "Replace loop by __builtin_ctz" by Glenn Kasten · 15 years ago
  62. f5c49165 Merge "suspended() and isSuspended() are const" by Glenn Kasten · 15 years ago
  63. 3762c31 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 15 years ago
  64. 143c7c8 am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 by Eino-Ville Talvala · 15 years ago
  65. c95ca2c AudioFlinger new can't fail by Glenn Kasten · 15 years ago
  66. 70522ad Don't allow reading of packagelist files. by Nick Kralevich · 15 years ago
  67. 325ee1c Use consistent style of & reference for AutoMutex by Glenn Kasten · 15 years ago
  68. a934c2c Use correct type for hardware call state by Glenn Kasten · 15 years ago
  69. b97d34c Disable wimax when mobile data is in Settings by tk.mun · 15 years ago
  70. b7feb1c Switch camera sounds to always use the system enforced audio stream. by Eino-Ville Talvala · 15 years ago
  71. 99c2fd3 By convention const goes before the type specifier by Glenn Kasten · 15 years ago
  72. adda27a Fix build warning by Glenn Kasten · 15 years ago
  73. 8564c8d Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 15 years ago
  74. c1d810d Replace loop by __builtin_ctz by Glenn Kasten · 15 years ago
  75. bd47cac Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" by Steve Block · 15 years ago
  76. 32350c7 Merge "Filter our v6 address from tethering dns." by Robert Greenwalt · 15 years ago
  77. 1dce841 suspended() and isSuspended() are const by Glenn Kasten · 15 years ago
  78. 6b14d58 Merge "Remove the notion of "active track" from mixer" by Glenn Kasten · 15 years ago
  79. a8719ad Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" by Glenn Kasten · 15 years ago
  80. e80a4cc Use the standard CC_LIKELY and CC_UNLIKELY macros by Glenn Kasten · 15 years ago
  81. dc8627e resolved conflicts for merge of 1a4b9939 to master by Eric Laurent · 15 years ago
  82. 6215d3f Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE by Steve Block · 15 years ago
  83. 5baa3a6 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE by Steve Block · 15 years ago
  84. 3c67373 Merge "Fix 5783857: Device Policy Manager doesn't allow Face Unlock" by Danielle Millett · 15 years ago
  85. b8f90a0e Merge "Test the correct return code from call to cryptfs." by Jeff Sharkey · 15 years ago
  86. c1bac3a VPN: fix a CloseGuard warning. by Chia-chi Yeh · 15 years ago
  87. 72dafb2 audioflinger: fix clicks on 48kHz audio. by Eric Laurent · 15 years ago
  88. 2364a22 Fix 5783857: Device Policy Manager doesn't allow Face Unlock by Danielle Millett · 15 years ago
  89. 68deb15 Remove the notion of "active track" from mixer by Glenn Kasten · 15 years ago
  90. 4f74d55 Filter our v6 address from tethering dns. by Robert Greenwalt · 15 years ago
  91. bdb0cee Merge "Remove dead code" by Glenn Kasten · 15 years ago
  92. da6aedf Test the correct return code from call to cryptfs. by Fredrik Roubert · 15 years ago
  93. 0ca16d6 Merge "audio effects: rename configure command" by Eric Laurent · 15 years ago
  94. 4abf882 audio effects: rename configure command by Eric Laurent · 15 years ago
  95. 31ba2e5 Remove dead code by Glenn Kasten · 15 years ago
  96. 279f872 Merge "Use constants for 2 and 32" by Glenn Kasten · 15 years ago
  97. d9de2d2 Merge "Extract out audio DSP code to utility library" by Glenn Kasten · 15 years ago
  98. 1f6f05d Use constants for 2 and 32 by Glenn Kasten · 15 years ago
  99. 586995a Merge "Use switch in AudioMixer::setParameter" by Glenn Kasten · 15 years ago
  100. bde164ab Use switch in AudioMixer::setParameter by Glenn Kasten · 15 years ago