1. 769501a am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  2. de99ee3 Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  3. 279612d am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  4. bc303ed Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  5. 021c841 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  6. 1b1123d am 354ac772: Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  7. 67caa6d am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  8. c6531cf am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  9. 43a1734 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  10. 30a186e am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  11. ea62931 am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  12. 30e9279 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  13. 59e82a0 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  14. 7917b45 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  15. 61d07fb Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  16. 9453064 Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  17. 9d0e88c Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  18. f27422a stagefright amr: Avoid C++/C99 for loops with variable declaration by Martin Storsjo · 14 years ago
  19. fbaf72b Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  20. 7c7674e Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  21. e98a953 Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  22. 7d8e0f1 Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  23. a4999a9 Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  24. d78b714 Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  25. 5b9c33c Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  26. 1ead790 stagefright amrnb: Remove extern from table definitions by Martin Storsjo · 14 years ago
  27. d95a846 stagefright amrnb: Add includes for prototype declarations of tables by Martin Storsjo · 14 years ago
  28. 93eec2b stagefright amrnb: Add missing const qualifier to table declarations in headers by Martin Storsjo · 14 years ago
  29. 034816f stagefright amrwb: Make a global const array static by Martin Storsjo · 14 years ago
  30. 46f715e stagefright amrwb: Make local const arrays static by Martin Storsjo · 14 years ago
  31. ffa34ed stagefright amrwb: Change a C++ style cast into a C style cast by Martin Storsjo · 14 years ago
  32. 9a2af45 am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  33. 338b9c9 stagefright aacenc: Remove a stray semicolon by Martin Storsjo · 14 years ago
  34. 8a3b370 stagefright aacenc: Add prototypes for arm specific implementations of functions by Martin Storsjo · 14 years ago
  35. b0238c3 stagefright amrwbenc: Change keyword ordering by Martin Storsjo · 14 years ago
  36. c4ef4bb stagefright amrwbenc: Remove a useless check by Martin Storsjo · 14 years ago
  37. b86b3c8 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  38. 5b823b4 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  39. 3919066 am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  40. c6a8eec Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  41. de8b924 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  42. 90b8ca7 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  43. 80d4b89 Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  44. 142ce9a am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  45. 9884ee5 am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  46. ccdf9e6 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  47. aa1639a Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  48. db7670a am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  49. 3e4d4ef Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  50. 7ce8b8c am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  51. 6dfeab4 Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  52. 3989d5c stagefright aacenc: Safeguard against overwriting bits by Martin Storsjo · 14 years ago
  53. c58295b Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  54. cf8b805 stagefright aacenc: Avoid warnings about incompatible pointer types by Martin Storsjo · 15 years ago
  55. 1148478 am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  56. 395584e am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  57. 013b73b Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
  58. bfd99cb am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  59. f27286d am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
  60. fa521a7 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  61. a70de78 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
  62. ceec4ae Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
  63. cdb22f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  64. 84e1987 am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 by Eric Laurent · 14 years ago
  65. 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
  66. a078e9b Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
  67. d9f0885 am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
  68. 5e37bc8 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
  69. 9c7ebfd Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
  70. 21e4b6e AudioFlinger: refine mixer sleep time logic by Eric Laurent · 14 years ago
  71. eaa0b5c DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)"" by Eric Laurent · 14 years ago
  72. 6813a4d DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)" by Justin Ho · 14 years ago
  73. 15dfda2 am fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1 by Justin Ho · 14 years ago
  74. 7baf789 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)" by Justin Ho · 14 years ago
  75. a3db30f am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 14 years ago
  76. d746737 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 14 years ago
  77. daef36f am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 14 years ago
  78. 3734cbc am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 14 years ago
  79. e744a90 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 14 years ago
  80. ca05a87 Merge ee4618bc by Jean-Baptiste Queru · 14 years ago
  81. 39fd8eb Rename LOG_ASSERT to ALOG_ASSERT by Steve Block · 14 years ago
  82. 9a8ded7 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) by Steve Block · 14 years ago
  83. aa70226 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) by Steve Block · 14 years ago
  84. 53feeb4 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) by Steve Block · 14 years ago
  85. 52546c0 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) by Steve Block · 14 years ago
  86. 3812256 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) by Steve Block · 14 years ago
  87. 90a6071 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  88. e4b8fa1 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  89. 9e5af59 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  90. 2774144 AudioFlinger: mix track only when really ready (2) by Eric Laurent · 14 years ago
  91. 9fc4dfb stagefright aacenc: Add const declarations to some pointers by Martin Storsjo · 15 years ago
  92. b45e50a am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
  93. bcc2252 am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
  94. 6086659 stagefright aacenc: Properly terminate a comment by Martin Storsjo · 14 years ago
  95. 721f2bb stagefright aacenc: Fix an inline asm constraint by Martin Storsjo · 14 years ago
  96. 9da7511 stagefright aacenc: Fix inline asm by Mans Rullgard · 14 years ago
  97. d2fdc71 stagefright aacenc: Fix inline asm constraints by Mans Rullgard · 14 years ago
  98. 132e42c stagefright aacenc: Zero-initialize a struct by Martin Storsjo · 14 years ago
  99. 2db3b23 stagefright aacenc: Fix type definitions for 64 bit platforms by Martin Storsjo · 14 years ago
  100. 2f0fb8c stagefright aacenc: Don't address a Word32 with a Word16 pointer by Martin Storsjo · 15 years ago