1. f607e2e am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  2. 9d7b4c0 am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  3. 4ade008 Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 13 years ago
  4. 89d94e7 audioflinger: fix issue with camcorder and A2DP by Eric Laurent · 13 years ago
  5. eb47ddf am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 13 years ago
  6. bfc4cdf am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 13 years ago
  7. 7d372bd am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 13 years ago
  8. c7c8375 am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp by Eric Laurent · 13 years ago
  9. e341547 resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp by Eric Laurent · 13 years ago
  10. 9c450b3 resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp by Eric Laurent · 13 years ago
  11. 2661809 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 13 years ago
  12. 9a55cd2 am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 by Eric Laurent · 13 years ago
  13. ca0928d MediaPlayerService: fix AudioSink latency by Eric Laurent · 13 years ago
  14. de61a78 AudioTrack: relax check on minimum buffer size by Eric Laurent · 13 years ago
  15. 51011e8 am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" by Glenn Kasten · 13 years ago
  16. 0fce406 am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" by Glenn Kasten · 13 years ago
  17. f281c22 am 42c6d163: Merge "Add empty libmedia_native in old location" by Glenn Kasten · 13 years ago
  18. 2ae5a73 Add empty libmedia_native in old location by Glenn Kasten · 13 years ago
  19. 26d2439 am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 13 years ago
  20. 5d181e4 am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
  21. ec431bb am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 13 years ago
  22. 62dac15 am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
  23. c98c883 am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 13 years ago
  24. 9045f8d am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
  25. dc1696c Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 13 years ago
  26. 1f7e2d9 Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
  27. a880639 am 859717ad: am 4d7bc655: Doc change: String changes for Android Market by Dirk Dougherty · 13 years ago
  28. 6a26abb am 4d7bc655: Doc change: String changes for Android Market by Dirk Dougherty · 13 years ago
  29. fd588e2 am 4d7bc655: Doc change: String changes for Android Market by Dirk Dougherty · 13 years ago
  30. 083644f Doc change: String changes for Android Market by Dirk Dougherty · 14 years ago
  31. d1aeb29 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  32. 769501a am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  33. 9f422f5 Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  34. de99ee3 Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  35. 279612d am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  36. bc303ed Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  37. 021c841 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  38. 1b1123d am 354ac772: Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  39. 67caa6d am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  40. c6531cf am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  41. 43a1734 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  42. 30a186e am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  43. ea62931 am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  44. 30e9279 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  45. 59e82a0 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  46. 7917b45 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  47. 61d07fb Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  48. 9453064 Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  49. 9d0e88c Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  50. f27422a stagefright amr: Avoid C++/C99 for loops with variable declaration by Martin Storsjo · 14 years ago
  51. fbaf72b Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  52. 7c7674e Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  53. e98a953 Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  54. 7d8e0f1 Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  55. a4999a9 Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  56. d78b714 Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  57. 5b9c33c Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  58. 1ead790 stagefright amrnb: Remove extern from table definitions by Martin Storsjo · 14 years ago
  59. d95a846 stagefright amrnb: Add includes for prototype declarations of tables by Martin Storsjo · 14 years ago
  60. 93eec2b stagefright amrnb: Add missing const qualifier to table declarations in headers by Martin Storsjo · 14 years ago
  61. 034816f stagefright amrwb: Make a global const array static by Martin Storsjo · 14 years ago
  62. 46f715e stagefright amrwb: Make local const arrays static by Martin Storsjo · 14 years ago
  63. ffa34ed stagefright amrwb: Change a C++ style cast into a C style cast by Martin Storsjo · 14 years ago
  64. 9a2af45 am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  65. 338b9c9 stagefright aacenc: Remove a stray semicolon by Martin Storsjo · 14 years ago
  66. 8a3b370 stagefright aacenc: Add prototypes for arm specific implementations of functions by Martin Storsjo · 14 years ago
  67. b0238c3 stagefright amrwbenc: Change keyword ordering by Martin Storsjo · 14 years ago
  68. c4ef4bb stagefright amrwbenc: Remove a useless check by Martin Storsjo · 14 years ago
  69. b86b3c8 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  70. 5b823b4 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  71. 3919066 am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  72. c6a8eec Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  73. de8b924 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  74. 90b8ca7 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  75. 80d4b89 Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  76. 142ce9a am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  77. 9884ee5 am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  78. ccdf9e6 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  79. aa1639a Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  80. db7670a am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  81. 3e4d4ef Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  82. 7ce8b8c am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  83. 6dfeab4 Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  84. dcdfc1a stagefright aacenc: Avoid overflows when calculating normFactor by Martin Storsjo · 13 years ago
  85. 01e29ed stagefright aacenc: Avoid a division by zero by Martin Storsjo · 13 years ago
  86. 3989d5c stagefright aacenc: Safeguard against overwriting bits by Martin Storsjo · 14 years ago
  87. c58295b Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  88. dc27bc4 stagefright amrwbenc: Simplify the definition of static_vo by Martin Storsjo · 14 years ago
  89. cf8b805 stagefright aacenc: Avoid warnings about incompatible pointer types by Martin Storsjo · 15 years ago
  90. 1148478 am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  91. 395584e am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  92. 013b73b Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  93. bfd99cb am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  94. f27286d am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
  95. fa521a7 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  96. a70de78 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
  97. ceec4ae Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  98. cdb22f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  99. 84e1987 am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 by Eric Laurent · 14 years ago
  100. 7c5aea0 am 41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1 by Eric Laurent · 14 years ago