aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 ↵Ray Essick2020-05-301-0/+2
|\ | | | | | | | | | | am: eeb1d2d3cf am: c329ddd2d9 Change-Id: I3f6c5f1f3066d366af0ee925a31edff92edb3e8b
| * point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 ↵Ray Essick2020-05-301-0/+2
| |\ | | | | | | | | | | | | | | | am: eeb1d2d3cf Change-Id: I1c4df033663d308ae24bc42d723ddf09f05b9de9
| | * point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3Ray Essick2020-05-301-0/+2
| | |\ | | | | | | | | | | | | Change-Id: I4af7365b2f0e59ecd52df4022faf4f7798932d7a
| | | * point to new repo hooks for mainline uploads am: ebc1030f65Ray Essick2020-05-291-0/+2
| | | |\ | | | | | | | | | | | | | | | Change-Id: I2f08b01ee76f7524fb041d8541847eb9b4832f14
| | | | * point to new repo hooks for mainline uploadsRay Essick2020-05-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
* | | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a am: 6313f8703e am: f4248aadbf Change-Id: Id629dd1319314e4964768b1dfa344273d6bde4eb
| * | | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a am: 6313f8703e Change-Id: I0471f66a21267ba4059976e491d0489a74ba34a7
| | * | | Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac ↵Treehugger Robot2020-05-211-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6d5490018a Change-Id: I7b5c175a03532581aac39584dcd308eca401642a
| | | * \ \ Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9acTreehugger Robot2020-05-211-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
| | | | * \ \ Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796Treehugger Robot2020-05-211-1/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
| | | | | * \ \ Merge "Fix license type s/b BY_EXCEPTION_ONLY"Treehugger Robot2020-05-211-1/+1
| | | | | |\ \ \
| | | | | | * | | Fix license type s/b BY_EXCEPTION_ONLYBob Badour2020-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Fraunhofer license has special requirements. Test: no code change Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
* | | | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 am: 194e249990 am: 248c3a9e0a Change-Id: I2d7833e7fc8964baa35792f57cec6d0137dc3f20
| * | | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 am: 194e249990 Change-Id: Ib567b1aeb584a8f820a455222322ece0686a5903
| | * | | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: ↵Kris Alder2020-05-211-0/+7
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f96c6f3a30 am: f60530f491 Change-Id: I20727c08423682ca8c6d3fcfa680423375c02156
| | | * | | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30Kris Alder2020-05-211-0/+7
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
| | | | * | | | | Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06Kris Alder2020-05-211-0/+7
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
| | | | | * | | | Merge "Added fuzz_config field in aac_dec_fuzzer"Kris Alder2020-05-211-0/+7
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | | * | | Added fuzz_config field in aac_dec_fuzzerAyushi Khopkar2020-05-191-0/+7
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: ./aac_dec_fuzzer Bug: 156871294 Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
* | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 am: c658b5ab4b -s ours am: 3566a11cc1 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: I295cfe08db63b7ae2a405aa1ed1746bfe54baa71
| * | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 am: c658b5ab4b -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: I73ce344f6f8287ec9d1a0565ae423a943de402e4
| | * \ \ \ \ \ \ Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8Jooyung Han2020-05-111-0/+7
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | Change-Id: I81dccfd0a9790f4251f88ab9c14ca1827d72e388
* | | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 -s ours am: d4b4152be0 -s ours am: d6b557a3b2 -s ours am: 7ab81f83ab -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: I12460ef9a7353f4605c2c35085a4a53554a45d09
| * | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 -s ours am: d4b4152be0 -s ours am: d6b557a3b2 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: Ifccfe73cb7ba221ce16c67dee097b982575bed86
| | * | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 -s ours am: d4b4152be0 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4 is in history Change-Id: Ib0f01bde91a3b106189590c9fb4eda78ebbd3bcb
| | | * | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: Ib442bb5ad9e4d17b8c900e1afab96aca86d09c52
* | | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 -s ours am: fcd9348524 -s ours am: 54b2057032 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: I8775ae106d1f813ffd0b5d871d5cf7fed719aa2c
| * | | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 -s ours am: fcd9348524 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: Ic8fee6c93a3913e20d8ce16e659777768ea3e81a
| | * | | | | | | [automerger skipped] Set min_sdk_version to be part of mainline modules am: ↵Jooyung Han2020-05-110-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71c477bae4 am: b6b6120ac8 -s ours am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history Change-Id: Id12352863d662df8517a57f6334bb2268c79b1e1
| | | * | | | | | Set min_sdk_version to be part of mainline modules am: 71c477bae4Jooyung Han2020-05-111-0/+7
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | |_|/ / / | | | |/| | | | Change-Id: Iab6ac89228254383926bcb569f8e211920e24650
| | | | * | | | Set min_sdk_version to be part of mainline modulesJooyung Han2020-05-111-0/+7
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Exempt-From-Owner-Approval: cherry-pick from aosp Bug: 152655956 Test: m Merged-In: I662ad951a3221f967b53e7af65cb203a4b4a5e5d Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d (cherry picked from commit d40f05a61897c4ba746dd2b383fff0c158026c1f)
* | | | | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 ↵Treehugger Robot2020-05-041-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33de11d223 am: 81352d07d7 am: 5521ad4a2c Change-Id: I442edd332271b12d4cb2454eedc00b63df1a46f9
| * | | | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 ↵Treehugger Robot2020-05-041-0/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 33de11d223 am: 81352d07d7 Change-Id: Ide2d89ea0e75e14127cf46c3bb9f5137ca237a3d
| | * | | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 ↵Treehugger Robot2020-05-041-0/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 33de11d223 Change-Id: I4960f573cd714dbdb1c20327f383cb45c983170b
| | | * | | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235Treehugger Robot2020-05-041-0/+3
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | Change-Id: If7805235d362630a3cd22e16d5d7a52bfae10157
| | | | * | | Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4aTreehugger Robot2020-05-041-0/+3
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | | | | | | | Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
| | | | | * | Merge "Add METADATA to aac: Apache2=NOTICE"Treehugger Robot2020-05-041-0/+3
| | | | | |\ \
| | | | | | * | Add METADATA to aac: Apache2=NOTICEBob Badour2020-04-281-0/+3
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I71f5c419c31c1758d4ee49158d40a50aef6abf5d
* | | | | | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d ↵Treehugger Robot2020-04-221-5/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25647c87aa am: fd16a67308 am: e09f99be0f am: 7e6b390ccb Change-Id: I5df01a50cf1bae3903b5b24c2138a7fe75406ccb
| * | | | | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d ↵Treehugger Robot2020-04-221-5/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25647c87aa am: fd16a67308 am: e09f99be0f Change-Id: I9dd37bb3373cdeab315cea8a64fcb4eadc672bd9
| | * | | | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d ↵Treehugger Robot2020-04-221-5/+12
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25647c87aa am: fd16a67308 Change-Id: Ie3494273b1a29ddd4148993ff2cd23557a2f52b0
| | | * | | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d ↵Treehugger Robot2020-04-221-5/+12
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25647c87aa Change-Id: Id09d8cf7f25b3a6aaffc1a3414db290058921ff2
| | | | * | | Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1dTreehugger Robot2020-04-221-5/+12
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e18b0e6a5e919b0346d0edad0c4e12e763c49fa
| | | | | * | Merge "Set min_sdk_version to be part of mainline modules"Treehugger Robot2020-04-221-5/+12
| | | | | |\ \
| | | | | | * | Set min_sdk_version to be part of mainline modulesJooyung Han2020-04-231-5/+12
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
* | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b807e1d -s ours am: 51993fe7bc am: 84a6b90591 am: c3979f352e -s ours am skip reason: subject contains skip directive Change-Id: If915458352edb594d6724ebc43562bd1f1548621
| * | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b807e1d -s ours am: 51993fe7bc am: 84a6b90591 Change-Id: Id91730772049a7a9affcf45e875b0f7d5d8aa764
| | * | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b807e1d -s ours am: 51993fe7bc Change-Id: I8ab66d34f185ddb9191bc8583fd51eb1eb36c57c
| | | * | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li2020-04-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stag-aosp-master am: 920b807e1d -s ours am skip reason: subject contains skip directive Change-Id: Ie9cc74b29545a74070e39ce3b0d66a85a4e87011
| | | | * | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 151763422 Change-Id: I15ed3fefee5678a9ab83f52fc0c4d4d3dd9dbcaf
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 19:29:35 +0000