- 9045f8d am 6db6ea02: Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
- 1f7e2d9 Merge changes I00c852e4,Ib31bf028 by Conley Owens · 13 years ago
- d1aeb29 am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
- 769501a am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
- 9f422f5 Merge changes I46c81dba,If1f40e9c,I652eaaa5 by Jean-Baptiste Queru · 13 years ago
- de99ee3 Merge "stagefright aacenc: Safeguard against overwriting bits" by Jean-Baptiste Queru · 13 years ago
- 279612d am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
- bc303ed Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration" by Jean-Baptiste Queru · 13 years ago
- 021c841 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
- 1b1123d am 354ac772: Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
- 67caa6d am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
- c6531cf am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
- 43a1734 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
- 30a186e am 77576ff4: Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
- ea62931 am be9a7055: Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
- 30e9279 am fe5f5d77: Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
- 59e82a0 am 94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
- 7917b45 am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
- 61d07fb Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" by Jean-Baptiste Queru · 13 years ago
- 9453064 Merge "stagefright amrwb: Make local const arrays static" by Jean-Baptiste Queru · 13 years ago
- 9d0e88c Merge "stagefright amrwb: Change a C++ style cast into a C style cast" by Jean-Baptiste Queru · 13 years ago
- f27422a stagefright amr: Avoid C++/C99 for loops with variable declaration by Martin Storsjo · 14 years ago
- fbaf72b Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7 by Jean-Baptiste Queru · 13 years ago
- 7c7674e Merge "stagefright aacenc: Simplify the definition of __inline" by Jean-Baptiste Queru · 13 years ago
- e98a953 Merge "stagefright amrwbenc: Remove a useless check" by Jean-Baptiste Queru · 13 years ago
- 7d8e0f1 Merge "stagefright aacenc: Remove a stray semicolon" by Jean-Baptiste Queru · 13 years ago
- a4999a9 Merge "stagefright amrwb: Make a global const array static" by Jean-Baptiste Queru · 13 years ago
- d78b714 Merge "stagefright amrwbenc: Change keyword ordering" by Jean-Baptiste Queru · 13 years ago
- 5b9c33c Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer" by Jean-Baptiste Queru · 13 years ago
- 1ead790 stagefright amrnb: Remove extern from table definitions by Martin Storsjo · 14 years ago
- d95a846 stagefright amrnb: Add includes for prototype declarations of tables by Martin Storsjo · 14 years ago
- 93eec2b stagefright amrnb: Add missing const qualifier to table declarations in headers by Martin Storsjo · 14 years ago
- 034816f stagefright amrwb: Make a global const array static by Martin Storsjo · 14 years ago
- 46f715e stagefright amrwb: Make local const arrays static by Martin Storsjo · 14 years ago
- ffa34ed stagefright amrwb: Change a C++ style cast into a C style cast by Martin Storsjo · 14 years ago
- 9a2af45 am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- 338b9c9 stagefright aacenc: Remove a stray semicolon by Martin Storsjo · 14 years ago
- 8a3b370 stagefright aacenc: Add prototypes for arm specific implementations of functions by Martin Storsjo · 14 years ago
- b0238c3 stagefright amrwbenc: Change keyword ordering by Martin Storsjo · 14 years ago
- c4ef4bb stagefright amrwbenc: Remove a useless check by Martin Storsjo · 14 years ago
- b86b3c8 Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" by Jean-Baptiste Queru · 13 years ago
- 5b823b4 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- 3919066 am ea227787: Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- c6a8eec Merge "stagefright aacenc: Fix an inline asm constraint" by Jean-Baptiste Queru · 13 years ago
- de8b924 Merge changes I903353c5,I822dcc74 by Jean-Baptiste Queru · 13 years ago
- 90b8ca7 am bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- 80d4b89 Merge "stagefright aacenc: Zero-initialize a struct" by Jean-Baptiste Queru · 13 years ago
- 142ce9a am e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- 9884ee5 am 47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- ccdf9e6 Merge "stagefright aacenc: Avoid warnings about incompatible pointer types" by Jean-Baptiste Queru · 13 years ago
- aa1639a Merge "stagefright aacenc: Add const declarations to some pointers" by Jean-Baptiste Queru · 13 years ago
- db7670a am 1b704610: Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- 3e4d4ef Merge "stagefright aacenc: Fix inline asm" by Jean-Baptiste Queru · 13 years ago
- 7ce8b8c am bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- 6dfeab4 Merge "stagefright aacenc: Fix inline asm constraints" by Jean-Baptiste Queru · 13 years ago
- dcdfc1a stagefright aacenc: Avoid overflows when calculating normFactor by Martin Storsjo · 13 years ago
- 01e29ed stagefright aacenc: Avoid a division by zero by Martin Storsjo · 13 years ago
- 3989d5c stagefright aacenc: Safeguard against overwriting bits by Martin Storsjo · 14 years ago
- c58295b Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
- cf8b805 stagefright aacenc: Avoid warnings about incompatible pointer types by Martin Storsjo · 15 years ago
- 1148478 am 64085d03: am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
- 395584e am 12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
- 013b73b Merge "stagefright aacenc: Fix type definitions for 64 bit platforms" by Jean-Baptiste Queru · 14 years ago
- bfd99cb am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
- f27286d am fc2ea24b: am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
- fa521a7 am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
- a70de78 am d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
- ceec4ae Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" by Jean-Baptiste Queru · 14 years ago
- cdb22f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 84e1987 am 7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1 by Eric Laurent · 14 years ago
- 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
- a078e9b Merge "stagefright aacenc: Add missing newlines at the end of files" by Jean-Baptiste Queru · 14 years ago
- d9f0885 am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
- 5e37bc8 am 164a9842: Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
- 9c7ebfd Merge "stagefright aacenc: Properly terminate a comment" by Jean-Baptiste Queru · 14 years ago
- 21e4b6e AudioFlinger: refine mixer sleep time logic by Eric Laurent · 14 years ago
- eaa0b5c DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)"" by Eric Laurent · 14 years ago
- 6813a4d DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)" by Justin Ho · 14 years ago
- 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
- 7baf789 DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)" by Justin Ho · 14 years ago
- a3db30f am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT" by Jean-Baptiste Queru · 14 years ago
- d746737 am 6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)" by Jean-Baptiste Queru · 14 years ago
- daef36f am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" by Jean-Baptiste Queru · 14 years ago
- 3734cbc am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" by Jean-Baptiste Queru · 14 years ago
- e744a90 am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" by Jean-Baptiste Queru · 14 years ago
- ca05a87 Merge ee4618bc by Jean-Baptiste Queru · 14 years ago
- 39fd8eb Rename LOG_ASSERT to ALOG_ASSERT by Steve Block · 14 years ago
- 9a8ded7 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) by Steve Block · 14 years ago
- aa70226 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) by Steve Block · 14 years ago
- 53feeb4 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) by Steve Block · 14 years ago
- 52546c0 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) by Steve Block · 14 years ago
- 3812256 Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) by Steve Block · 14 years ago
- 90a6071 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
- e4b8fa1 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
- 9e5af59 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
- 2774144 AudioFlinger: mix track only when really ready (2) by Eric Laurent · 14 years ago
- 9fc4dfb stagefright aacenc: Add const declarations to some pointers by Martin Storsjo · 15 years ago
- b45e50a am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
- bcc2252 am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
- 6086659 stagefright aacenc: Properly terminate a comment by Martin Storsjo · 14 years ago