aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ↵Bill Yi2020-11-050-0/+0
|\ | | | | | | | | | | | | | | | | | | - DO NOT MERGE" am: f4adff7fbb am: 0834f1a0b8 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ic6a0942fdd1af69a14653a456accfd76e9361bf1
| * Merge "Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE" am: ↵Bill Yi2020-11-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | f4adff7fbb Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ied811f647e67defe1286b9a8e4a0bdc2c89da3c2
| | * 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 ↵Bill Yi2020-11-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE am: 5b4265a02a am: 8b4e287ff6 -s ours am skip reason: Change-Id I44e842648acbceb02bbc28cf2ad729a0caddf60d with SHA-1 1f2e0ecb62 is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ia3fae7d8939333684ff3ea15081ac69624d58873
| * | | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGE am: 5b4265a02aBill Yi2020-11-050-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1486978 Change-Id: Ifc71d75171dfbc250f59774aea3ddb950e70d356
| | * | Merge rvc-release RP1A.201105.002 to aosp-master - DO NOT MERGEBill Yi2020-11-041-6/+6
| | |\ \ | | | |/ | | |/| | | | | | | | | Merged-In: I44e842648acbceb02bbc28cf2ad729a0caddf60d Change-Id: Iead5cf2ca1c993da0844a11d1e64bf3cc86ed5dd
* | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master ↵Bill Yi2020-11-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - DO NOT MERGE am: 4c3407e563 -s ours am skip reason: Change-Id I31fe9fe1e8dd7e919848be94dd73dfb779e7065d with SHA-1 aacea3ffc5 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12984835 Change-Id: I44e842648acbceb02bbc28cf2ad729a0caddf60d
| * | | Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGEBill Yi2020-11-031-6/+6
| |\ \ \ | | |/ / | |/| / | | |/ | | | Merged-In: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d Change-Id: I462d697908f9803317f038c916d5942967efa28a
| | * Merge cherrypicks of [12620612, 12620613, 12620936, 12620457, 12616684, ↵android-build-team Robot2020-09-161-6/+6
| | |\ | | | | | | | | | | | | | | | | | | | | 12621005, 12620883, 12620884, 12620846, 12620847, 12620869, 12620848, 12620849, 12620961, 12620962, 12620827, 12620614, 12620197, 12620885, 12620198, 12621039, 12621040, 12621041, 12620937, 12620615, 12620886] into rvc-release Change-Id: If3dab82f5ef50b669aa488a49aebe27bb6070079
| | | * Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().Fraunhofer IIS FDK2020-09-161-6/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the bug the SBR decoder has already set up 9 channels and tries to allocate one more channel. The assignment of the QMF channels to SBR channels fails since the QMF domain manages only 8+1 channels instead of 10 channels as reqeusted by SBR. Here we have added a check in sbrDecoder_InitElement() which will return with a parse error in case additional SBR channels would exceed the maximum number of SBR channels. This solves the potential heap buffer overflow. Bug: 158762825 Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e (cherry picked from commit bb8f983bf36ee2ad8af6acebf4823a58060004ab)
| | * Snap for 6544675 from ebc1030f65bb1e1e7dccf99e56a5d0221f097fdb to rvc-releaseandroid-build-team Robot2020-05-301-0/+2
| | |\ | | | | | | | | | | | | Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
| | * \ Snap for 6484097 from 71c477bae4e0b1bfad90fd4e4dbba496aa6d9c68 to rvc-releaseandroid-build-team Robot2020-05-121-0/+7
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
| | * \ \ Snap for 6211803 from 261fadc3a2221829196158824a512f11268756ef to rvc-releaseandroid-build-team Robot2020-02-164-24/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I1d56321205dbd74479a72ecbbde137a18eef044b
| | * \ \ \ Snap for 6210127 from e016635f0d3a5c7532b00711ce461f97a13f7bc2 to rvc-releaseandroid-build-team Robot2020-02-1559-904/+1111
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Icca87a4feea92b453adc049922c543eb3bf048fd
| | * \ \ \ \ Snap for 6206568 from 925092e8fcd9f3635fdff6ff34f8a4a290916885 to rvc-releaseandroid-build-team Robot2020-02-144-104/+53
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide088e86f1ced06e7717f8d78d187058bc7db370
| | * \ \ \ \ \ Snap for 6203617 from 31f66f6d3ffcfa429c170b2c35250982d11f5082 to rvc-releaseandroid-build-team Robot2020-02-138-19/+71
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefbacc1498ce7caf6c6ccb2df4c8b4c6cca4ab76
| | * \ \ \ \ \ \ Snap for 6164373 from 3255d513ce56f98085d77dd7b92840b73ab4cfd3 to rvc-releaseandroid-build-team Robot2020-01-282-5/+5
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I396303dd4ab4b8a24e0c6cf05b7ea0d48e3bdbc8
| | * \ \ \ \ \ \ \ Snap for 6157842 from f04a8a855cf8ddb5996c8e191fd3fa15b3808657 to rvc-releaseandroid-build-team Robot2020-01-248-33/+169
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd800c3d313c30fc67595fc70baaf69b12188cd7
| | * \ \ \ \ \ \ \ \ Snap for 6154573 from cedcc475f52dd704497524dda6ec2ef430d2b6c5 to rvc-releaseandroid-build-team Robot2020-01-233-3/+12
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6edb0ebedba940eb136ae37bed4e010ee76f3d58
| | * \ \ \ \ \ \ \ \ \ Snap for 6145313 from cee316ab3ebde92047b5e76d15c00768b92cb890 to rvc-releaseandroid-build-team Robot2020-01-183-28/+19
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I642e8bbffa03f9c9e718eb115125c1e0fa852556
| | * \ \ \ \ \ \ \ \ \ \ Snap for 6142138 from 1020e48d6e76506ac85a7678fe950ce7245d3aea to rvc-releaseandroid-build-team Robot2020-01-177-157/+138
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icb323d1007194553c9b7494024ae7fab252696ee
| | * \ \ \ \ \ \ \ \ \ \ \ Snap for 6138855 from 063d5f30864c6293855da6f7b8dd482d7c408158 to rvc-releaseandroid-build-team Robot2020-01-165-94/+121
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I76b653e2aa437267603833e7fade774c4d210243
| | * \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6110375 from 0c42941882ea8d9b11fc645ec46f5013009064ed to rvc-releaseandroid-build-team Robot2020-01-041-22/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I35fa8d590ccadcd7865be09f72b893056aa85db9
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 6104206 from 47b23c88cfe81bbcc9ff0c8de1608283de18a475 to rvc-releaseandroid-build-team Robot2019-12-3117-209/+313
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I37ae8a78b271948e025a2e6c071453480dcc9a52
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5978242 from 77e652f76694102b9c6499d5a2209ca0bf44e0c3 to rvc-releaseandroid-build-team Robot2019-10-310-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I15dbe4ac65b3db43a510451b201c5da9455913d7
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5956624 from fc8faa38d90380adfb61b2b280a36c73369c9aff to rvc-releaseandroid-build-team Robot2019-10-227-48/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I90c7f7de4ed5bb04e355e181028c850f6e95d8ad
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5945950 from 2152ae1a5ef0511e0b38a981745eb910f2af9bca to rvc-releaseandroid-build-team Robot2019-10-175-52/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4945162a10785a18df685897114d3715d75e807d
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5942013 from da5b0dcb3c01197b3499e0b569babcb0f5a09bbe to rvc-releaseandroid-build-team Robot2019-10-164-35/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I84e4e06054e0d2c04fe64b23f963e056b8e72947
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5939454 from b1b306443a1cc0308fa563b40a281bae53346d01 to rvc-releaseandroid-build-team Robot2019-10-155-397/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6dae09bcdf2319101d416e69dbd3b8a5cc97ac95
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5936682 from f26eb8af7c38047ad113072a6de38e069dc5cf3f to rvc-releaseandroid-build-team Robot2019-10-123-10/+32
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5a7309c9ef4f186d05c08f072707ce3e2bf6a9b8
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5864382 from 17bc55672e5cd439c590ee1096ff5fa904aea360 to rvc-releaseandroid-build-team Robot2019-09-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1813c2a55faf4d56dac4671182c7f040fad50a4c
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5860386 from 710de1d4dbb96dc6e513fd5a20c5433946e670e3 to rvc-releaseandroid-build-team Robot2019-09-070-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafff7feea21247c065ee00282e6215c2aa14be1e
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5716344 from 092cd5352de1732a947ec312893e89720625bc94 to rvc-releaseandroid-build-team Robot2019-07-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28d54ed952190394138ba5158cd2701baeba753f
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5706589 from 916e0784d6429eb89ee503c4589b04cf76b61675 to rvc-releaseandroid-build-team Robot2019-07-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic515243b6eed19ff54d962aa5c01697605a9f10a
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5648992 from 622fc42193d7f7dacf21b346f7b31f359efd5d54 to rvc-releaseandroid-build-team Robot2019-06-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ab67089aa1abf13a51f04656179b9847821d1e5
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5643956 from 22344b4b51b83764ec7811bf35507feb8aa3e417 to rvc-releaseandroid-build-team Robot2019-06-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied0ed17701f3ae140cd05bf39de19a73ed705668
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5582544 from c8caff8633e31447de6702b17051adb0cf9e9afe to rvc-releaseandroid-build-team Robot2019-05-181-7/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0876a7884b52391ce1dc737a80441be9d99c9cc
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5579845 from 54ad80ad13bc10aebcfc1a02cd59913069102cb8 to rvc-releaseandroid-build-team Robot2019-05-181-6/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I993edad0f9f3fdb2f538749d00aa4c1c08a3926c
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5575726 from d3a460ed7b4510b4e7de5516611a8de2d7cf98b2 to rvc-releaseandroid-build-team Robot2019-05-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaeaa73794ba9673a9c4ced0689f83776fc3892aa
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5571274 from dc920b39e51b3a0586fd17ce63b6bb27f02482de to rvc-releaseandroid-build-team Robot2019-05-168-1155/+4338
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61eb33f0d0965a0503e5b49d09566e3de5087ae
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5566918 from e48f30ae1f536b836267bcf103db8c38a3d2592a to rvc-releaseandroid-build-team Robot2019-05-157-94/+139
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36a7ac7c4cb5b280331648caf34ebbdc5cd23cc8
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5511049 from 47697ab8f4b11c45dc3bda52e30f9f6946a2c2bd to rvc-releaseandroid-build-team Robot2019-04-278-61/+101
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifcc2b30ab1fb6627de6565ab62ccc6064508ba15
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Snap for 5457103 from c97a7cf298c330964029364d340bb02e67d14dc2 to rvc-releaseandroid-build-team Robot2019-04-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3c64ec5a7f925cb6db6d4e31cfc9bea64514428
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s oursXin Li2020-10-090-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 with SHA-1 73da86e336 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12795744 Change-Id: I31fe9fe1e8dd7e919848be94dd73dfb779e7065d
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged-In: Icfe1613791fb53502d99e3030dd9e9baa3fa5c33 Change-Id: I7d1c753bfa3343d5931058143dc016c3a0861700
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: ↵Xin Li2020-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a0396347 -s ours am: c0dbde6b33 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I5b8161f44651f40c168a81ba535e8c26ad5b533e
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: ↵Xin Li2020-09-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a0396347 -s ours am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I1713993ae0e8fb75c4e27fdad6c8e263b7391a03
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s oursXin Li2020-09-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866 Change-Id: I6d537ca8862ea4f0409b2f173ab9d7e9cafc70ae
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Merge Android R"Xin Li2020-09-1098-2107/+2228
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Android RXin Li2020-09-0898-2107/+2228
| | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 168057903 Merged-In: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 Change-Id: I29b7ae1003fb72aeb5fbf1fdfdceea849c1c12b8
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 13:29:15 +0000