summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip ab/6749736 in stage.HEADmasterXin Li2020-10-080-0/+0
|\
| * [automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: c...Jiyong Park2020-07-010-0/+0
| |\
| * \ Remove unnecessary sysprop settings am: 4744ee6eb6Jiyong Park2020-06-301-9/+0
| |\ \
| * \ \ Merge changes from topic "am-5c49126713864de48797e12bf7acf180" into rvc-d1-de...Automerger Merge Worker2020-06-220-0/+0
| |\ \ \
| | * \ \ Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ...Cyril Lee2020-06-220-0/+0
| | |\ \ \
| | * \ \ \ Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a...Ken Chen2020-06-221-4/+0
| | |\ \ \ \
| * | \ \ \ \ Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ...Cyril Lee2020-06-220-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ...android-11.0.0_r16android11-d1-b-releaseCyril Lee2020-06-220-0/+0
| | |\ \ \ \ \ \
| * | | | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a...Ken Chen2020-06-221-4/+0
| |\| | | | | | | | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a...Ken 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
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ audio: update microphone information am: d5d8262550 am: fa894ffff5Jasmine Cha2020-06-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ audio: update microphone information am: d5d8262550 am: 2d517bc0b2Jasmine Cha2020-06-111-31/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | audio: update microphone information am: d5d8262550Jasmine Cha2020-06-111-31/+83
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge QQ3A.200605.002 into master am: 233d637b10 -s ours...Xin Li2020-06-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Add METADATA to taimen: Apache2=NOTICE am: 6a7a2fb46b am: de6d41a44c am: 84ca...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: 8f4ad2afa7 am: 2deb553697Yo Chiang2020-04-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Remove ELF PRODUCT_COPY_FILES am: 8f4ad2afa7 am: 503b8fd145Yo Chiang2020-04-012-18/+432
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Remove ELF PRODUCT_COPY_FILES am: 8f4ad2afa7Yo 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Update vendor blobs list for R am: 141c48e6f0 am: 3b5407ed1e" into rvc...Automerger Merge Worker2020-02-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update vendor blobs list for R am: 141c48e6f0 am: 3b5407ed1eAutomerger Merge Worker2020-02-282-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Update vendor blobs list for R am: 141c48e6f0 am: 65e79e055aAutomerger Merge Worker2020-02-282-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Update vendor blobs list for R am: 141c48e6f0Automerger Merge Worker2020-02-282-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rollback telephony-resources am: 778dbec241 am: 09a8cc364cAutomerger Merge Worker2020-02-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Rollback telephony-resources am: 778dbec241 am: 5974469cf6Automerger Merge Worker2020-02-269-218/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | Rollback telephony-resources am: 778dbec241Automerger Merge Worker2020-02-269-218/+0
| |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Merge Android R am: 7a56081cce -s oursXin Li2020-09-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge Android RXin Li2020-09-089-88/+601
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)Xin Li2020-08-279-88/+601
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | [automerger skipped] Remove unnecessary sysprop settings am: 18953b4917 am: c...Jiyong Park2020-07-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Remove unnecessary sysprop settingsJiyong Park2020-06-301-9/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ...Cyril Lee2020-06-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" ...android11-devCyril Lee2020-06-221-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a...Ken Chen2020-06-221-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."Ken 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
| | | |_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | audio: update microphone information am: d5d8262550Jasmine Cha2020-06-111-31/+83
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | audio: update microphone informationJasmine Cha2020-06-101-31/+83
| | |/ / / / / / / / / / / /