summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Import translations. DO NOT MERGE ANYWHEREHEADandroid-s-beta-5android-s-beta-4android-s-beta-3masterandroid-s-beta-5android-s-beta-4Bill Yi2021-07-038-22/+22
* DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-186-19/+19
|\
| * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| |\
| | * Snap for 7227142 from 85ba3f440e46fbabaa10d4747ab20935e80eaa77 to rvc-qpr3-re...android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid-build-team Robot2021-03-221-1/+1
| | |\
| | * \ Snap for 7206633 from f4c6d08f11b6010950318983534ec7e217e64d52 to rvc-qpr3-re...android-build-team Robot2021-03-131-1/+1
| | |\ \
| | * \ \ Snap for 7113391 from 4e0345e17f2cc546f167302e610c7b51ae533888 to rvc-qpr3-re...android-build-team Robot2021-01-302-2/+2
| | |\ \ \
| * | \ \ \ DO NOT MERGE - Merge ab/7272582 am: 03a240521eXin Li2021-06-140-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4d98863f2...temp_ab_7272582Bill Yi2021-04-090-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 85ba3f440...Bill Yi2021-03-210-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-211-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ...TreeHugger Robot2021-03-130-0/+0
| |\| | | | |
| | * | | | | Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-devTreeHugger Robot2021-03-130-0/+0
| | |\ \ \ \ \
| | | * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-131-1/+1
| | | | |_|_|/ | | | |/| | |
| * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9f76beeca...Bill Yi2021-03-130-0/+0
| |\| | | | |
| | * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-121-1/+1
| | |/ / / /
| * | | | | [automerger skipped] Merge RQ2A.210305.007 am: c606c498e6 -s ours am: c82795f...Xin Li2021-03-030-0/+0
| |\ \ \ \ \
| * \ \ \ \ \ [automerger skipped] Merge ab/7061308 into stage. am: 6ed23a6ce6 -s oursXin Li2021-02-230-0/+0
| |\ \ \ \ \ \
| * \ \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/EmergencyInfo am: a98f90da79 a...Bob Badour2021-02-194-0/+16
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4e0345e17...Bill Yi2021-01-300-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-302-2/+2
| | | |_|_|_|_|/ | | |/| | | | |
| | | | | | | * [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: 400c...Xin Li2021-05-080-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | DO NOT MERGE - Mark RQ2A.210105.001 as merged.android-s-beta-2android-s-beta-1Xin Li2021-05-070-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Snap for 6990741 from 80f96ec488b426e227d702db6ee7ef4c835f9150 to rvc-qpr2-re...android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-releaseandroid-build-team Robot2020-11-242-9/+9
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Snap for 6944357 from fc5e7f9d905ba1339772219b87f5f0707ada4872 to rvc-qpr2-re...android-build-team Robot2020-10-310-0/+0
| |\ \ \ \ \ \ \ \
| | | | | | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 93c9e1a2b...Bill Yi2021-04-220-0/+0
| | | | | | | | |/| | |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-04-2239-90/+90
| | | | | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-04-0937-71/+71
| | | | | | | |/
| | | | | | | * [automerger skipped] Merge RQ2A.210305.007 am: c606c498e6 -s oursXin Li2021-03-030-0/+0
| | | | | | |/| | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge RQ2A.210305.007Xin Li2021-03-0335-66/+66
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge ab/7061308 into stage.Xin Li2021-02-2135-66/+66
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | * | | | Merge "Update EmergencyInfo owners file" am: 15390e3e2f am: c342b577ceTreehugger Robot2020-12-081-0/+4
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 87877a451...Bill Yi2020-12-050-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e297697d7...Bill Yi2020-12-040-0/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 0...Xin Li2020-12-030-0/+0
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80f96ec48...Bill Yi2020-11-230-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-11-232-9/+9
| | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b6a2e74...Bill Yi2020-10-310-0/+0
| | |\| | | | | |
| | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b6a2e74...Bill Yi2020-10-310-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b6a2e74...Bill Yi2020-10-310-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b6a2e74...Bill Yi2020-10-310-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 69b6a2e74...Bill Yi2020-10-310-0/+0
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-10-315-15/+15
| | * | | | | | | | | [automerger skipped] Merge redfin/bramble support. am: c8f47ed41b -s ours am:...Xin Li2020-10-200-0/+0
| | |\| | | | | | | |
| | | * | | | | | | | [automerger skipped] Merge redfin/bramble support. am: c8f47ed41b -s ours am:...Xin Li2020-10-200-0/+0
| | | |\ \ \ \ \ \ \ \
| | * | | | | | | | | | Disable emergency dialer trampoline am: 864f831152 am: 20a849cbb0 am: 92eea1b52bFan Zhang2020-10-121-1/+2
| | |\| | | | | | | | |
| | | * | | | | | | | | Disable emergency dialer trampoline am: 864f831152 am: 20a849cbb0Fan Zhang2020-10-121-1/+2
| | | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: d495c16978 -s ours am: 21d...Xin Li2020-10-090-0/+0
| | |\| | | | | | | | | |
| | | * | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: d495c16978 -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c2c8e65e5...Bill Yi2020-10-050-0/+0
| | |\| | | | | | | | | | |