1. ec94eca am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 12 years ago
  2. 0435339 resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp by Eric Laurent · 12 years ago
  3. dc63f3f MediaPlayerService: fix AudioSink latency by Eric Laurent · 12 years ago
  4. 0df6894 AudioTrack: relax check on minimum buffer size by Eric Laurent · 12 years ago
  5. aa1bd6d am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location" by Glenn Kasten · 12 years ago
  6. d8cc142 am 42c6d163: Merge "Add empty libmedia_native in old location" by Glenn Kasten · 12 years ago
  7. e6aa25b Add empty libmedia_native in old location by Glenn Kasten · 12 years ago
  8. c24f5ba am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 12 years ago
  9. 66da3fd am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 12 years ago
  10. 9a3f3b9 am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 12 years ago
  11. 972efaf am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 12 years ago
  12. 67cf093 Merge "stagefright amrwbenc: Simplify the definition of static_vo" by Conley Owens · 12 years ago
  13. 6db6ea0 Merge changes I00c852e4,Ib31bf028 by Conley Owens · 12 years ago
  14. 56bab8b am 4d7bc655: Doc change: String changes for Android Market by Dirk Dougherty · 12 years ago
  15. 4d7bc655 Doc change: String changes for Android Market by Dirk Dougherty · 13 years ago
  16. 0ddfe24 am eb4f3256: Set the video encoding bit rate for the media recorder stress test. by Yu Shan Emily Lau · 13 years ago
  17. eb4f325 Set the video encoding bit rate for the media recorder stress test. by Yu Shan Emily Lau · 13 years ago
  18. 4f90636 am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  19. 225eec8 am f9d4ba77: am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  20. 9734843 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  21. f9d4ba7 am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  22. 704131c Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
  23. 69aae36 Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
  24. 743acee am ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1 by Jason Noguchi · 13 years ago
  25. f016dc1 am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  26. f881fa5 Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
  27. faf38b2 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  28. 163777b am 354ac772: Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  29. ded8e68 am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  30. d91b744 am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  31. 4f74be5 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  32. 7346d73 am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  33. 32901b3 am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  34. 716a051 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  35. c1da1e1 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  36. 6bc542e am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  37. 9e3d957 Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
  38. 354ac77 Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
  39. 695cfe1 Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
  40. b084141 stagefright amr: Avoid C++/C99 for loops with variable declaration by Martin Storsjo · 13 years ago
  41. f7f1280 Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
  42. 1a864db Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
  43. 77576ff Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
  44. be9a705 Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
  45. fe5f5d7 Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
  46. 94ee1bf Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
  47. 5aff259 Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
  48. dafebd6 stagefright amrnb: Remove extern from table definitions by Martin Storsjo · 13 years ago
  49. 9cb864d stagefright amrnb: Add includes for prototype declarations of tables by Martin Storsjo · 13 years ago
  50. 67d536a stagefright amrnb: Add missing const qualifier to table declarations in headers by Martin Storsjo · 13 years ago
  51. 7a60831 stagefright amrwb: Make a global const array static by Martin Storsjo · 13 years ago
  52. b3094e4 stagefright amrwb: Make local const arrays static by Martin Storsjo · 13 years ago
  53. ab01498 stagefright amrwb: Change a C++ style cast into a C style cast by Martin Storsjo · 13 years ago
  54. 26d9944 am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  55. a9e1747 stagefright aacenc: Remove a stray semicolon by Martin Storsjo · 13 years ago
  56. e3c3499 stagefright aacenc: Add prototypes for arm specific implementations of functions by Martin Storsjo · 13 years ago
  57. 4a12db6 stagefright amrwbenc: Change keyword ordering by Martin Storsjo · 13 years ago
  58. 30b0bb4 stagefright amrwbenc: Remove a useless check by Martin Storsjo · 13 years ago
  59. 6a300a5 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
  60. 2accfc1 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  61. c4aa19a am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  62. d6a2515 Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
  63. ea22778 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
  64. 5f83b95 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  65. bf45bbf Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
  66. e7650c3 am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  67. 7ffa454 am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  68. e5bdd24 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
  69. 47b56c5 Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
  70. aa86aa6 am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  71. 1b70461 Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
  72. d7ab4e0 am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  73. bf1e85b Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
  74. 27c8d9b Adding time lapse test to mediaframework stress suite. by Jason Noguchi · 13 years ago
  75. 27bd8da stagefright aacenc: Avoid overflows when calculating normFactor by Martin Storsjo · 13 years ago
  76. 23d3628 stagefright aacenc: Avoid a division by zero by Martin Storsjo · 13 years ago
  77. 79cfde6 am 52bfc243: docs: fix misc doc bugs from external issue tracker by Scott Main · 13 years ago
  78. 52bfc24 docs: fix misc doc bugs from external issue tracker by Scott Main · 13 years ago
  79. f4e98ba stagefright aacenc: Safeguard against overwriting bits by Martin Storsjo · 13 years ago
  80. 62b4d5b stagefright amrwbenc: Simplify the definition of static_vo by Martin Storsjo · 13 years ago
  81. 832dc8f7 stagefright aacenc: Avoid warnings about incompatible pointer types by Martin Storsjo · 14 years ago
  82. 64085d0 am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 13 years ago
  83. 1204550 Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 13 years ago
  84. 4cd2b34 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 13 years ago
  85. fc2ea24 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 13 years ago
  86. 98539a4 Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 13 years ago
  87. d80cbb8 Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 13 years ago
  88. 2ae5805 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 13 years ago
  89. 164a984 Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 13 years ago
  90. c3c36b4f am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 13 years ago
  91. 12b7da6 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 13 years ago
  92. f3f650d am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 13 years ago
  93. 08d3c6e am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 13 years ago
  94. 7ae8420 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 13 years ago
  95. 97aa8ee Merge ee4618bc by Jean-Baptiste Queru · 13 years ago
  96. f68633d Rename LOG_ASSERT to ALOG_ASSERT by Steve Block · 13 years ago
  97. c6aacce Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) by Steve Block · 13 years ago
  98. a51f0e7 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) by Steve Block · 13 years ago
  99. 933e856 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) by Steve Block · 13 years ago
  100. 1afd5ba Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) by Steve Block · 13 years ago