aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
* | \ 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
| |\ \ \ \ \
| * \ \ \ \ \ Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-releaseandroid-build-team Robot2020-02-138-19/+71
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-releaseandroid-build-team Robot2020-01-282-5/+5
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-releaseandroid-build-team Robot2020-01-248-33/+169
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Snap for 6154573 from cedcc475f52dd704497524dda6ec2ef430d2b6c5 to rvc-releaseandroid-build-team Robot2020-01-233-3/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Snap for 6145313 from cee316ab3ebde92047b5e76d15c00768b92cb890 to rvc-releaseandroid-build-team Robot2020-01-183-28/+19
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Snap for 6142138 from 1020e48d6e76506ac85a7678fe950ce7245d3aea to rvc-releaseandroid-build-team Robot2020-01-177-157/+138
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Snap for 6138855 from 063d5f30864c6293855da6f7b8dd482d7c408158 to rvc-releaseandroid-build-team Robot2020-01-165-94/+121
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6110375 from 0c42941882ea8d9b11fc645ec46f5013009064ed to rvc-releaseandroid-build-team Robot2020-01-041-22/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-releaseandroid-build-team Robot2019-12-3117-209/+313
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5978242 from 77e652f76694102b9c6499d5a2209ca0bf44e0c3 to rvc-releaseandroid-build-team Robot2019-10-310-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5956624 from fc8faa38d90380adfb61b2b280a36c73369c9aff to rvc-releaseandroid-build-team Robot2019-10-227-48/+58
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5945950 from 2152ae1a5ef0511e0b38a981745eb910f2af9bca to rvc-releaseandroid-build-team Robot2019-10-175-52/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5942013 from da5b0dcb3c01197b3499e0b569babcb0f5a09bbe to rvc-releaseandroid-build-team Robot2019-10-164-35/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5939454 from b1b306443a1cc0308fa563b40a281bae53346d01 to rvc-releaseandroid-build-team Robot2019-10-155-397/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5936682 from f26eb8af7c38047ad113072a6de38e069dc5cf3f to rvc-releaseandroid-build-team Robot2019-10-123-10/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5864382 from 17bc55672e5cd439c590ee1096ff5fa904aea360 to rvc-releaseandroid-build-team Robot2019-09-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5860386 from 710de1d4dbb96dc6e513fd5a20c5433946e670e3 to rvc-releaseandroid-build-team Robot2019-09-070-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5716344 from 092cd5352de1732a947ec312893e89720625bc94 to rvc-releaseandroid-build-team Robot2019-07-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5706589 from 916e0784d6429eb89ee503c4589b04cf76b61675 to rvc-releaseandroid-build-team Robot2019-07-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5648992 from 622fc42193d7f7dacf21b346f7b31f359efd5d54 to rvc-releaseandroid-build-team Robot2019-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5643956 from 22344b4b51b83764ec7811bf35507feb8aa3e417 to rvc-releaseandroid-build-team Robot2019-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5582544 from c8caff8633e31447de6702b17051adb0cf9e9afe to rvc-releaseandroid-build-team Robot2019-05-181-7/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5579845 from 54ad80ad13bc10aebcfc1a02cd59913069102cb8 to rvc-releaseandroid-build-team Robot2019-05-181-6/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5575726 from d3a460ed7b4510b4e7de5516611a8de2d7cf98b2 to rvc-releaseandroid-build-team Robot2019-05-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5571274 from dc920b39e51b3a0586fd17ce63b6bb27f02482de to rvc-releaseandroid-build-team Robot2019-05-168-1155/+4338
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5566918 from e48f30ae1f536b836267bcf103db8c38a3d2592a to rvc-releaseandroid-build-team Robot2019-05-157-94/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5511049 from 47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd to rvc-releaseandroid-build-team Robot2019-04-278-61/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5457103 from c97a7cf298c330964029364d340bb02e67d14dc2 to rvc-releaseandroid-build-team Robot2019-04-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0...Jean-Michel Trivi2020-07-101-5/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993Ray Essick2020-05-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3Ray Essick2020-05-301-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ point to new repo hooks for mainline uploads am: ebc1030f65Ray Essick2020-05-291-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ...Treehugger Robot2020-05-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a...Kris Alder2020-05-211-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7...Jooyung Han2020-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7...Jooyung Han2020-05-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set min_sdk_version to be part of mainline modules am: 71c477bae4Jooyung Han2020-05-111-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 am:...Treehugger Robot2020-05-041-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d am:...Treehugger Robot2020-04-221-5/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 02:07:40 +0000