aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] Mark ab/7061308 as merged in stage. am: 6d10f91a77 -s oursXin Li2021-02-200-0/+0
|\
| * Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
| |\
* | | Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06f am: 7ad8...Bob Badour2021-02-172-0/+42
|\| |
| * | Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06fBob Badour2021-02-172-0/+42
| |\ \
| | * \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac"Bob Badour2021-02-172-0/+42
| | |\ \
| | | * | [LSC] Add LOCAL_LICENSE_KINDS to external/aacBob Badour2021-02-142-0/+42
* | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8 am: b3ae2fd27fTreehugger Robot2021-02-171-1/+1
|\| | | |
| * | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8Treehugger Robot2021-02-171-1/+1
| |\| | |
| | * | | Merge "Fix improper assignment in aac_enc_fuzzer"Treehugger Robot2021-02-171-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix improper assignment in aac_enc_fuzzerAnuj Joshi2021-02-171-1/+1
| | |/ /
* | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62 am: 118aad7689Treehugger Robot2021-02-143-52/+174
|\| | |
| * | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62Treehugger Robot2021-02-143-52/+174
| |\| |
| | * | Merge "aac_enc_fuzzer: Improve code coverage"Treehugger Robot2021-02-143-52/+174
| | |\ \
| | | * | aac_enc_fuzzer: Improve code coverageAnuj Joshi2021-02-013-52/+174
| | |/ /
* | | | Merge "aac remove diag" am: f13c7a4054 am: 2b3a48d3b7Cindy Zhou2021-01-201-7/+0
|\| | |
| * | | Merge "aac remove diag" am: f13c7a4054Cindy Zhou2021-01-201-7/+0
| |\| |
| | * | Merge "aac remove diag"Cindy Zhou2021-01-201-7/+0
| | |\ \
| | | * | aac remove diagCindy Zhou2021-01-131-7/+0
* | | | | Merge "Added aac_enc_fuzzer" am: 093573a634 am: a85ab74b62Kris Alder2021-01-133-9/+484
|\| | | |
| * | | | Merge "Added aac_enc_fuzzer" am: 093573a634Kris Alder2021-01-133-9/+484
| |\| | |
| | * | | Merge "Added aac_enc_fuzzer"Kris Alder2021-01-133-9/+484
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Added aac_enc_fuzzerAnuj Joshi2020-12-283-9/+484
* | | | | Merge "Enable cfi for aac" am: 5690f9c39f am: 738df3d018Cindy Zhou2021-01-081-2/+8
|\| | | |
| * | | | Merge "Enable cfi for aac" am: 5690f9c39fCindy Zhou2021-01-081-2/+8
| |\| | |
| | * | | Merge "Enable cfi for aac"Cindy Zhou2021-01-081-2/+8
| | |\ \ \
| | | * | | Enable cfi for aacCindy Zhou2020-12-171-2/+8
| | | |/ /
* | | | / Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery...Treehugger Robot2021-01-084-36/+83
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery...Treehugger Robot2021-01-084-36/+83
| |\| | | | |/ | |/|
| | * Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery...Treehugger Robot2021-01-084-36/+83
| |/|
| | * Adjust VBR mode depending on given peak bitrate and fix crash recovery usage.Fraunhofer IIS FDK2021-01-084-36/+83
| |/
* | Mark ab/6881855 as merged am: b831187d3aXin Li2020-11-240-0/+0
|\|
| * Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
| |\
* | \ [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ...Bill Yi2020-11-050-0/+0
|\ \ \
| * | | [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ...Bill Yi2020-11-050-0/+0
| |\| |
| | * | Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: f...Bill Yi2020-11-050-0/+0
| | |\ \
| | | * \ Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE"Bill Yi2020-11-051-6/+6
| | | |\ \
* | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NO...Bill Yi2020-11-050-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NO...Bill Yi2020-11-050-0/+0
| |\| | | |
| | * | | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02aBill Yi2020-11-050-0/+0
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGEBill Yi2020-11-041-6/+6
| | | |\ \ \ | | | | |/ / | | | |/| |
* | | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...Bill Yi2020-11-040-0/+0
|\| | | | |
| * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...Bill Yi2020-11-040-0/+0
| |\| | | |
| | * | | | Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGEBill Yi2020-11-031-6/+6
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| | | * | Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, 12621...android-build-team Robot2020-09-161-6/+6
| | | |\ \
| | | | * | Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-161-6/+6
| | | |/ /
| | | * | Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-releaseandroid-build-team Robot2020-05-301-0/+2
| | | |\ \
| | | * \ \ Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-releaseandroid-build-team Robot2020-05-121-0/+7
| | | |\ \ \
| | | * \ \ \ Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-releaseandroid-build-team Robot2020-02-164-24/+3
| | | |\ \ \ \
| | | * \ \ \ \ Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-releaseandroid-build-team Robot2020-02-1559-904/+1111
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-releaseandroid-build-team Robot2020-02-144-104/+53
| | | |\ \ \ \ \ \