summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip ab/6749736 in stage.HEADmasterXin Li2020-10-080-0/+0
|\
| * Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: 29a1...Ken Chen2020-06-220-0/+0
| |\
| * \ Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: 29a1...Ken Chen2020-06-221-4/+0
| |\ \
| | * \ Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: 29a1...android-11.0.0_r16android11-d1-b-releaseKen Chen2020-06-221-4/+0
| | |\ \
| * | \ \ Merge changes from topic "am-700a2a681bdb4a528bf52c8b1542452c" into rvc-d1-de...Automerger Merge Worker2020-06-200-0/+0
| |\ \ \ \
| | * \ \ \ Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_prior...Cyril Lee2020-06-200-0/+0
| | |\ \ \ \
| | * \ \ \ \ [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_act...Cyril Lee2020-06-201-0/+4
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_prior...Cyril Lee2020-06-200-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_prior...Cyril Lee2020-06-200-0/+0
| | |\ \ \ \ \ \
| * | | | | | | | [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_act...Cyril Lee2020-06-201-0/+4
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_act...Cyril Lee2020-06-201-0/+4
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge "Merge "audio: update microphone information" into rvc-dev am: 4de6bb27...Automerger Merge Worker2020-06-110-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge "audio: update microphone information" into rvc-dev am: 4de6bb27bc am: ...TreeHugger Robot2020-06-111-31/+83
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge "audio: update microphone information" into rvc-dev am: 4de6bb27bc am: ...TreeHugger Robot2020-06-111-31/+83
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "audio: update microphone information" into rvc-dev am: 4de6bb27bcTreeHugger Robot2020-06-111-31/+83
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Walleye brightness curve. am: a893431795 am: 96ef064bcfFiona Campbell2020-06-090-0/+0
| |\| | | | | | | | |
| | * | | | | | | | | Fix Walleye brightness curve. am: a893431795Fiona Campbell2020-06-091-2/+2
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Fix Walleye brightness curve. am: a893431795 am: 4a038046c8Fiona Campbell2020-06-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge QQ3A.200605.002 into master am: 4223d690c0 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Add METADATA to muskie: Apache2=NOTICE am: 45b7240c5c am: 3db9993a9c am: c2d2...Bob Badour2020-05-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Remove ELF PRODUCT_COPY_FILES am: 17bdc8b112 am: 9b0e93f9dfYo Chiang2020-04-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Remove ELF PRODUCT_COPY_FILES am: 17bdc8b112 am: 025e02039cYo Chiang2020-04-012-18/+432
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Remove ELF PRODUCT_COPY_FILES am: 17bdc8b112Yo Chiang2020-04-012-18/+432
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into ...Xin Li2020-03-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge stage-aosp-master to aosp-master - DO NOT MERGE am...Automerger Merge Worker2020-03-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update vendor blobs list for R am: e0055ed8e2 am: f1a0707309Automerger Merge Worker2020-02-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update vendor blobs list for R am: e0055ed8e2 am: 7b06897ca4Automerger Merge Worker2020-02-282-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Update vendor blobs list for R am: e0055ed8e2Automerger Merge Worker2020-02-282-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rollback telephony-resources am: 1dfc69633b am: 84affa492eAutomerger Merge Worker2020-02-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rollback telephony-resources am: 1dfc69633b am: 38fc0fa8a7Automerger Merge Worker2020-02-269-228/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Rollback telephony-resources am: 1dfc69633bAutomerger Merge Worker2020-02-269-228/+0
| |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge Android R am: 0e2a02db30 -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android RXin Li2020-09-087-73/+605
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-277-73/+605
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: 29a1...Ken Chen2020-06-221-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."android11-devKen Chen2020-06-221-4/+0
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_prior...Cyril Lee2020-06-200-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_prior...Cyril Lee2020-06-201-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_act...Cyril Lee2020-06-201-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | [DO NOT MERGE] Remove ASSIST_GESTURE action from deferred_medium_priority_act...Cyril Lee2020-06-161-0/+4
| | | |_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge "audio: update microphone information" into rvc-dev am: 4de6bb27bcTreeHugger Robot2020-06-111-31/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge "audio: update microphone information" into rvc-devTreeHugger Robot2020-06-111-31/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | audio: update microphone informationJasmine Cha2020-06-101-31/+83
| | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | / Fix Walleye brightness curve. am: a893431795Fiona Campbell2020-06-091-2/+2
| |\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix Walleye brightness curve.Fiona Campbell2020-06-081-2/+2
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | [automerger skipped] Merge QQ3A.200605.002 into master am: 4223d690c0 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Add METADATA to muskie: Apache2=NOTICE am: 45b7240c5c am: 3db9993a9cBob Badour2020-05-051-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Remove ELF PRODUCT_COPY_FILES am: 17bdc8b112Yo Chiang2020-04-012-18/+432
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |