summaryrefslogtreecommitdiffstats
Commit message (Collapse)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
| | | | | Auto-generated-cl: translation import Change-Id: I89d0a9a75e820e6ce3dd8b32defa721717b0c835
* DO NOT MERGE - Merge RQ3A.210605.005Xin Li2021-06-186-19/+19
|\ | | | | | | | | | | Bug: 190855093 Merged-In: I1676276be24ab0f141953f95265629393fc9009f Change-Id: Ib07b7b80cfcb989715a0a2905b883831e2fe2158
| * DO NOT MERGE - Mark RQ3A.210410.001 as mergedtmp_sam_RQ3A.210605.005Xin Li2021-06-170-0/+0
| |\ | | | | | | | | | | | | | | | Bug: 190855093 Merged-In: I501d93a38397798fee4e758fa85bbdc1691dfd7e Change-Id: I1676276be24ab0f141953f95265629393fc9009f
| | * Snap for 7227142 from 85ba3f440e46fbabaa10d4747ab20935e80eaa77 to ↵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
| | |\ | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: I0872c27bb3de29bc33a7254e5635a7b43fb0d633
| | * \ Snap for 7206633 from f4c6d08f11b6010950318983534ec7e217e64d52 to ↵android-build-team Robot2021-03-131-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: Ia8699f616a0fe217b98e40c2e2b59373cd04de28
| | * \ \ Snap for 7113391 from 4e0345e17f2cc546f167302e610c7b51ae533888 to ↵android-build-team Robot2021-01-302-2/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr3-release Change-Id: I237f795879ae4af7a0a140b1e8a8a4dc83669bfd
| * | \ \ \ DO NOT MERGE - Merge ab/7272582 am: 03a240521eXin Li2021-06-140-0/+0
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1735915 Change-Id: I501d93a38397798fee4e758fa85bbdc1691dfd7e
* | | | | | DO NOT MERGE - Merge ab/7272582Xin Li2021-06-110-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 190855093 Change-Id: I258c46b32a179be82c3c405c9d0c721191252f1d
| * \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵temp_ab_7272582Bill Yi2021-04-090-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4d98863f2b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/14142605 Change-Id: I1f9763f693d1333fd65333427d9e5e18a462374a
| * \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-03-210-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 85ba3f440e -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13939991 Change-Id: I875259ec442db7b93b930b19fcd6ab4586147aa1
| | * | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-211-1/+1
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I0b1f52f681285289c52b5d81b1e664e3a92eb2a1
| * | | | | | [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot2021-03-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr-dev am: f4c6d08f11 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13856994 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I746728abcc351af0bfc817ad98f6a9dc4d3692b3
| | * | | | | 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
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Iddef8ffcaf8bfcace925e59bcbeb59788b6e3053
| * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-03-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f76beeca8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13857745 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I404c6fcf245c266c1f63725adf50e16194e738c3
| | * | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-03-121-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I5480dffe53e6bb887a478db6f999b88dc1137efd
| * | | | | [automerger skipped] Merge RQ2A.210305.007 am: c606c498e6 -s ours am: ↵Xin Li2021-03-030-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c82795fbd4 -s ours am skip reason: Change-Id I095c43e072e2df8b4aa4a1956c87ff0e9ac19d44 with SHA-1 6ed23a6ce6 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1613662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3ca5d5c4ca95097d9f54f472b8314114ffa6014c
| * \ \ \ \ \ [automerger skipped] Merge ab/7061308 into stage. am: 6ed23a6ce6 -s oursXin Li2021-02-230-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Idd210eea267ea1f15d58b6bf68da57a935eed8b4 with SHA-1 83f2c4b63e is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13658399 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief1799266c1590b5d06806819d2fd9278dd3e11c
| * \ \ \ \ \ \ [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/EmergencyInfo am: a98f90da79 ↵Bob Badour2021-02-194-0/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ab3fe13c86 Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1588199 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4681f285a46a0d6cdfdce2255bdd66d0920b9637
| * \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-01-300-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e0345e17f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13443781 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b1ee922c1944c1a93a3c59df4dbb0f5ee4c9b53
| | * | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-01-302-2/+2
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: Ica918b8d4e585f7977cab0f59f0c2160b2a4c5a9
| | | | | | | * [automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am: ↵Xin Li2021-05-080-0/+0
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 400c3df20e -s ours am skip reason: Merged-In I81fcdc717564d4692720e2d55be8e11ea997e9cf with SHA-1 93c9e1a2b2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1699295 Change-Id: I24163f11998907e4704ff79f4d6f56ae85070114
* | | | | | | | DO NOT MERGE - Mark RQ2A.210105.001 as merged.android-s-beta-2android-s-beta-1Xin Li2021-05-070-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I81fcdc717564d4692720e2d55be8e11ea997e9cf Change-Id: I97e6de2a60d681c966b4d458c23ef36b717d10ae
| * \ \ \ \ \ \ \ Snap for 6990741 from 80f96ec488b426e227d702db6ee7ef4c835f9150 to ↵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
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr2-release Change-Id: I7e9afbadfa2a5fc00c390b05e1d38f75dad9c7b4
| * | | | | | | | Snap for 6944357 from fc5e7f9d905ba1339772219b87f5f0707ada4872 to ↵android-build-team Robot2020-10-310-0/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rvc-qpr2-release Change-Id: Iaad2827ad3232393452327b9f16d8f89ee3e7405
| | | | | | | | | * [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2021-04-220-0/+0
| | | | | | | | |/| | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93c9e1a2b2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1685105 Change-Id: I67197620b71e27c342996bb1cdbb499e53bcc5c2
* | | | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2021-04-2239-90/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I81fcdc717564d4692720e2d55be8e11ea997e9cf
| | | | | | | | * Import translations. DO NOT MERGE ANYWHEREBill Yi2021-04-0937-71/+71
| | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I0b21b18228e65ae1273063bbc9a380ae0edd3859
| | | | | | | * [automerger skipped] Merge RQ2A.210305.007 am: c606c498e6 -s oursXin Li2021-03-030-0/+0
| | | | | | |/| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I095c43e072e2df8b4aa4a1956c87ff0e9ac19d44 with SHA-1 6ed23a6ce6 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1613662 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3317197de19d2009d7b05bf1db7cdcbf86e5fdb7
* | | | | | | Merge RQ2A.210305.007Xin Li2021-03-0335-66/+66
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I095c43e072e2df8b4aa4a1956c87ff0e9ac19d44 Change-Id: Ibb2ea9f0f144d51e7a2e57e83d67a4f593897ed1
| * | | | | | Merge ab/7061308 into stage.Xin Li2021-02-2135-66/+66
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | / | | |_|_|_|/ | |/| | | | | | | | | | Bug: 180401296 Merged-In: Idd210eea267ea1f15d58b6bf68da57a935eed8b4 Change-Id: I095c43e072e2df8b4aa4a1956c87ff0e9ac19d44
| | * | | | Merge "Update EmergencyInfo owners file" am: 15390e3e2f am: c342b577ceTreehugger Robot2020-12-081-0/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1520150 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idd210eea267ea1f15d58b6bf68da57a935eed8b4
| | * \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-12-050-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87877a4517 -s ours am: 314f9aa879 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1519088 Change-Id: I75fc33137d40604148114ef71599d61028ca199f
| | * \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-12-040-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e297697d73 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13165167 Change-Id: I138081c71f3693aa84107ba01890adc59ff946c3
| | * \ \ \ \ \ \ [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: ↵Xin Li2020-12-030-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ae9349f28 -s ours am skip reason: Change-Id Iab863ea144be4308a4ccd67cf51b4f82075423c4 with SHA-1 d7b0884016 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13122760 Change-Id: I31c4462a4555b727faa97156c6d2673c5ff7d00c
| | * \ \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-11-230-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80f96ec488 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/13108308 Change-Id: Ic482302745163a1ca4ee550c5c998ece066db461
| | | * | | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-11-232-9/+9
| | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I18de15f801976203a4535f3f76826a78aac7151f
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-310-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69b6a2e740 -s ours am: ca9ac4d9bc -s ours am: fc5e7f9d90 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12962527 Change-Id: If435debb08bc193c4de20ae0d3ba8ad2a4e9e440
| | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-310-0/+0
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69b6a2e740 -s ours am: ca9ac4d9bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12962527 Change-Id: Iede0fcdd7faec66f4e4a49e6197df3a612538900
| | * | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-310-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69b6a2e740 -s ours am: ca9ac4d9bc -s ours am: 555459bc45 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12962527 Change-Id: Ib7b7e71d745d95b5950e9f8629ed8808b48e85db
| | | * \ \ \ \ \ \ [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-310-0/+0
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69b6a2e740 -s ours am: ca9ac4d9bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12962527 Change-Id: Ia59ff906e74048555dff72030f4f0a6b7600df29
| | | | * | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-310-0/+0
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69b6a2e740 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12962527 Change-Id: I4481a9376af38337354495cf66fac4bd43921da5
| | | | | * | | | | | Import translations. DO NOT MERGE ANYWHEREBill Yi2020-10-315-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Change-Id: I42a3784eb2eff94ccf9aa3214956db3280dd7256
| | * | | | | | | | | [automerger skipped] Merge redfin/bramble support. am: c8f47ed41b -s ours ↵Xin Li2020-10-200-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3954eff1e5 -s ours am: 1291fe69e6 -s ours am skip reason: Change-Id Ic8385efa36a518601ff99e45bfb0b3025baec7f7 with SHA-1 20a849cbb0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1466505 Change-Id: I1b998170938d648b8def36eefe2e6c24f8346301
| | | * | | | | | | | [automerger skipped] Merge redfin/bramble support. am: c8f47ed41b -s ours ↵Xin Li2020-10-200-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3954eff1e5 -s ours am skip reason: Change-Id Ic8385efa36a518601ff99e45bfb0b3025baec7f7 with SHA-1 20a849cbb0 is in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1466505 Change-Id: I876f3aaef16f6cd2e1d2e23366c26f4110ce012f
| | * | | | | | | | | | Disable emergency dialer trampoline am: 864f831152 am: 20a849cbb0 am: 92eea1b52bFan Zhang2020-10-121-1/+2
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1451164 Change-Id: I971c600ed5d60231ddbdec45200141cd5e42adbc
| | | * | | | | | | | | Disable emergency dialer trampoline am: 864f831152 am: 20a849cbb0Fan Zhang2020-10-121-1/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/1451164 Change-Id: I5cba18d1076181a2e100869da8ec527018b80c18
| | * | | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: d495c16978 -s ours am: ↵Xin Li2020-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21d78171ff -s ours am skip reason: Change-Id I3ce283ab745a92dfbd341674b5247e004288257e with SHA-1 194e65270f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12797476 Change-Id: Ice7ea51d41489e00ea0c3ebb0601b82d7709178f
| | | * | | | | | | | | | [automerger skipped] Skip ab/6749736 in stage. am: d495c16978 -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id I3ce283ab745a92dfbd341674b5247e004288257e with SHA-1 194e65270f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12797476 Change-Id: Ie447c9b60cbf457fcacc06a276d8cf65d20302c5
| | * | | | | | | | | | | | [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi2020-10-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2c8e65e54 -s ours am: 65be300083 -s ours am: bfe0f38f24 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/12761370 Change-Id: I9726a94672303b3f400d88a138c641413cbf0a9a