aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 5864382 from 17bc55672e5cd439c590ee1096ff5fa904aea360 to rvc-releaseandroid-build-team Robot2019-09-100-0/+0
|\ | | | | | | Change-Id: I1813c2a55faf4d56dac4671182c7f040fad50a4c
| * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am: 7fc6e3f8ff -s ours am: 99e78ac95f -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I1b0e74e7c405aa4e9b9841cc9ad931561ab5df56
| | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am: 7fc6e3f8ff -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I67e58e13c18499f1fdcd5b6b72b8afce257a22f7
| | | * [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li2019-09-080-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 09dc9b073f -s ours am skip reason: change_id I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c with SHA1 a209adb315 is in history Change-Id: I921ce87ed814fc4b8ff3977e3b5fefa796e872f2
| | | | * Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li2019-09-080-0/+0
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No content change. Bug: 135460123 Change-Id: I058d0d709bb7752aa276e0047d2e0b81403ee5fc Merged-In: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
* | | | | | Snap for 5860386 from 710de1d4dbb96dc6e513fd5a20c5433946e670e3 to rvc-releaseandroid-build-team Robot2019-09-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iafff7feea21247c065ee00282e6215c2aa14be1e
| * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 am: 35b1ada3b4 am: c7d03309f9 -s ours am skip reason: subject contains skip directive Change-Id: Ibfc869a47e6e34a425709bf45e2c9d37af633db8
| | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | |\| | | | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 am: 35b1ada3b4 Change-Id: I735bbaf8236207a00fb745c8e57a04c77b76b432
| | | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ↵Xin Li2019-09-050-0/+0
| | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d929f68a05 -s ours am: 5d3d55e2c7 Change-Id: I0ada3904a4004089fdfdb43966288c019cf58d8c
| | | * | [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-050-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d929f68a05 -s ours am skip reason: subject contains skip directive Change-Id: Iabc2e26ef91b10d03f213fa1a694cb921ca4c1bb
| | | | * Merge "DO NOT MERGE - Merge Android 10 into master"Xin Li2019-09-0532-1352/+4643
| | | | |\
| | | | | * DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-0432-1352/+4643
| | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 139893257 Change-Id: I7e02014b30f1ae5d19dbb7126ebb2a69c411fe5c
* | | | | | Snap for 5716344 from 092cd5352de1732a947ec312893e89720625bc94 to rvc-releaseandroid-build-team Robot2019-07-100-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I28d54ed952190394138ba5158cd2701baeba753f
| * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am: bf68b4972f am: a3f72d9e44 -s ours am skip reason: subject contains skip directive Change-Id: I89cb15471dea474be46354bae3f04b39430e7355
| | * | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am: bf68b4972f Change-Id: I05880e6e76d61b683b55364726e841097f130a16
| | | * | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am: 6266103519 -s ours am skip reason: subject contains skip directive Change-Id: I69945c03e154530e7d917f1de7f0669480715686
| | | | * | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master" am: c2eb64586d -s ours am skip reason: subject contains skip directive Change-Id: I637c44703fdee4aff09ea97fe2dce5c8395a2c63
| | | | | * Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"Xin Li2019-07-090-0/+0
| | | | | |\
| * | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am: 50d8447d97 am: 2480568f89 -s ours am skip reason: subject contains skip directive Change-Id: I78e6e4e8878c1b48c2dbeb2fdc48f48e7926e9a3
| | * | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am: 50d8447d97 Change-Id: Ifb01dd1cbab4f450563f31f93c19dad5bf079404
| | | * | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am: 506ae97bee -s ours am skip reason: subject contains skip directive Change-Id: I715b40974bbd1381f7b72c0ee399fe4214444a0d
| | | | * | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-07-090-0/+0
| | | |/| | | | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190705.004) into master am: 569027011c -s ours am skip reason: subject contains skip directive Change-Id: I5aecc5cecde457bbfa6a076c68bd0b14bfa5da3f
| | | | * | DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into masterXin Li2019-07-090-0/+0
| | | | |\ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | Bug: 136196576 Change-Id: Ibab15539f2fd0081ef9f8e1a607461d5238c9a88
| | | | | * Snap for 5622519 from 81b3f635622cda59f93cc13edf0621da064bc072 to ↵android-build-team Robot2019-07-080-0/+0
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-platform-release Change-Id: I2fa7ee95d121ad53fd5e3cc445b83fbeb7bb2d66
| | | | | | * Snap for 5526913 from b81f869de3f7c5b6395606d5f36cef57987eae8f to ↵android-build-team Robot2019-05-030-0/+0
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I15a91b27f0bcef3b820d665017fa8d4d105ee33d
| | | | | | * \ Merge cherrypicks of [7070078, 7070079, 7070080, 7070608, 7069857, 7069858, ↵android-build-team Robot2019-04-161-0/+8
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7069859, 7070136, 7070137, 7070138, 7071045, 7071046, 7071047, 7071048, 7070081, 7070863, 7070082, 7069862, 7069863, 7069864, 7071085, 7070118] into pi-qpr3-b-release Change-Id: I253904631907415999bad3cbcd4259896b8a3844
| | | | | | | * | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
| | | | | | * | Snap for 5447620 from 69514bb3082c0f26a3684501240c982b79ecc22b to ↵android-build-team Robot2019-04-161-8/+0
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pi-qpr3-b-release Change-Id: I85690855119d1d87f317117f7454b99a1353a388
| | | | | | * \ \ Merge cherrypicks of [7068682, 7066360, 7066361, 7066362, 7068985, 7068986, ↵android-build-team Robot2019-04-161-0/+8
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7068987, 7068800, 7068004] into pi-qpr3-b-release Change-Id: I779161184ff3f9875b815efe88c9d12e046879e8
| | | | | | | * | Add sanity check in huff_decode()Fraunhofer IIS FDK2019-04-161-0/+8
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc Bug: 119292397 Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773 (cherry picked from commit b81f869de3f7c5b6395606d5f36cef57987eae8f)
* | | | | | | | Snap for 5706589 from 916e0784d6429eb89ee503c4589b04cf76b61675 to rvc-releaseandroid-build-team Robot2019-07-040-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic515243b6eed19ff54d962aa5c01697605a9f10a
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li2019-07-020-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (5699924) into stage-aosp-master am: 4d56b880e2 am: 0942f837c5 -s ours am skip reason: subject contains skip directive Change-Id: Ia49c4c0c1b61b95d4393f7312189c237d86e5ea2
| | * | | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-020-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 4d56b880e2 Change-Id: Ida7e07f2d981f3df794171aba9385dcc691f43c8
| | | * | | | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li2019-07-0132-1352/+4643
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134405016 Change-Id: I30ab93ed5c2fa3c47306058d1a0f749b8101b01e
* | | | | | | | | Snap for 5648992 from 622fc42193d7f7dacf21b346f7b31f359efd5d54 to rvc-releaseandroid-build-team Robot2019-06-110-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7ab67089aa1abf13a51f04656179b9847821d1e5
| * | | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am: 058d1295f4 am: a55b37a564 -s ours am skip reason: subject contains skip directive Change-Id: Ib2fd42b4ea1dcc8a0dbe897458ad489144b8b35a
| | * | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am: 058d1295f4 Change-Id: Icf8cfab1834934bd73b2d7cefdfcffc3ac225dc6
| | | * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am: c10b5daa8d -s ours am skip reason: subject contains skip directive Change-Id: Ia1d6cf99beb6ee823b4e188c59025139db431f02
| | | | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release ↵Xin Li2019-06-100-0/+0
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master" am: b018de371d -s ours am skip reason: subject contains skip directive Change-Id: Iacff6609b76e136716228b61a989a4a81b051c4f
| | | | | * | | | Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master"Xin Li2019-06-100-0/+0
| | | | | |\ \ \ \
| * | | | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours am: f8d9637d81 am: 4e18d84cae -s ours am skip reason: subject contains skip directive Change-Id: I0594ed8210488ccdb7d0b4a20b886a1cb744efc7
| | * | | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours am: f8d9637d81 Change-Id: Iba3e60f6fb4670f7f97159c42fc3ff366817a3b1
| | | * | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am: e52d79c58e -s ours am skip reason: subject contains skip directive Change-Id: I68fb72ac2812bd9499eca63c16ddd4e02f483506
| | | | * | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵The Android Open Source Project2019-06-100-0/+0
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into master am: c3dcb81334 -s ours am skip reason: subject contains skip directive Change-Id: I92a43f949f1ca6b2d060c3bd8b5edf097b7db637
| | | | | * | | | | DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into masterThe Android Open Source Project2019-06-100-0/+0
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| / / / / | | | | | |/ / / / | | | | | | | | | Bug: 134605042 Change-Id: Ife6e13bfe9017388e48143e2f6475111d5bebca3
* | | | | | | | | Snap for 5643956 from 22344b4b51b83764ec7811bf35507feb8aa3e417 to rvc-releaseandroid-build-team Robot2019-06-080-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied0ed17701f3ae140cd05bf39de19a73ed705668
| * | | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-06-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am: 68078adb95 am: e8095d4d8e -s ours am skip reason: subject contains skip directive Change-Id: Idc89c0aef321103bb42fbe7297f91155019255e0
| | * | | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-06-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am: 68078adb95 Change-Id: If38052df38ec81ce9e488ab9a58bc61724f2e664
| | | * | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li2019-06-050-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (PPRL.190605.003) into stage-aosp-master am: 0ef4321d83 -s ours am skip reason: subject contains skip directive Change-Id: I3e301b33d28f4a84f2cc584751315fa994628732
| | | | * | | | | DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into ↵Xin Li2019-06-050-0/+0
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| / / / | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 134605042 Change-Id: I5741210a2732e88685d878a5eb96d381924fa8d3
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 07:48:19 +0000