Xin Li
3ba15f2799
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours am: 60c3c08aa4
-s ours am: aaccc6518d
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: Id217503f7f4423df25ae89eea305c2b2d3412a6a
2021-10-08 07:56:19 +00:00
Xin Li
aaccc6518d
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours am: 60c3c08aa4
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: I8f0c28fcf3ec2f7e26079318af10feaf2626787c
2021-10-08 01:39:04 +00:00
Xin Li
60c3c08aa4
[automerger skipped] Merge "Merge Android 12" am: 436a520a57
-s ours
...
am skip reason: Merged-In Iecc1012adcebfc5a10d865173cc01108f5394749 with SHA-1 fa27392f8a
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1847353
Change-Id: I1d324fd336fa96c02539ae08351620b0736070ca
2021-10-08 01:19:38 +00:00
Xin Li
436a520a57
Merge "Merge Android 12"
2021-10-07 23:50:29 +00:00
Xin Li
d913b9d918
Merge Android 12
...
Bug: 202323961
Merged-In: Iecc1012adcebfc5a10d865173cc01108f5394749
Change-Id: I7d9f02d6ec2ed8015935d8c3634395750a12c58a
2021-10-06 22:51:43 +00:00
Treehugger Robot
fc87149c4d
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
am: fa27392f8a
am: 361f8f4118
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: I13dad035e3ae763f4acdcfb77e715671708d2a92
2021-09-23 23:06:05 +00:00
Treehugger Robot
00f28ca88b
Merge "Remove enh from OWNERS." am: 23db699634
am: 174562c83c
am: 9af1361162
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I760dccb08edbf35e900f9a8022bb9dd81b405eb5
2021-09-23 23:05:58 +00:00
Treehugger Robot
361f8f4118
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
am: fa27392f8a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: Icd0f444c746810df4c9a1cc373eedfad1cd08d8b
2021-09-23 22:48:07 +00:00
Treehugger Robot
9af1361162
Merge "Remove enh from OWNERS." am: 23db699634
am: 174562c83c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I9dae1785c2fbd3622b858a3a8c20323efe77bde2
2021-09-23 22:47:58 +00:00
Treehugger Robot
fa27392f8a
Merge "Warn on repo upload
if you're not uploading to AOSP master." am: 026eb31f80
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834836
Change-Id: Iecc1012adcebfc5a10d865173cc01108f5394749
2021-09-23 22:30:56 +00:00
Treehugger Robot
174562c83c
Merge "Remove enh from OWNERS." am: 23db699634
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1834837
Change-Id: I37b3eae8d1299c37e759fb0094fbd57a9903a734
2021-09-23 22:30:51 +00:00
Treehugger Robot
026eb31f80
Merge "Warn on repo upload
if you're not uploading to AOSP master."
2021-09-23 22:26:00 +00:00
Treehugger Robot
23db699634
Merge "Remove enh from OWNERS."
2021-09-23 22:20:01 +00:00
Treehugger Robot
0bc337f6a1
Merge "Add support to use preferred graphics backend" am: afab2aeb76
am: e53506a56f
am: 760d9f0fa9
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835073
Change-Id: I97040ad5f619633453d367a54e33e2aab154485a
2021-09-23 21:15:08 +00:00
Kelvin Zhang
2c2117dac0
Merge "Update OWNERS file" am: 7f8f3fcc33
am: 6011fcc875
am: fe131174ea
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835393
Change-Id: I97784dc46f21749029ea1dc3cc89ac9d77b06082
2021-09-23 21:14:56 +00:00
Elliott Hughes
2623f687e7
Remove enh from OWNERS.
...
I'm happy to be added as a reviewer for random questions, but it
probably doesn't make sense for me to be the alphabetically first
suggestion if you try gerrit's "SUGGEST OWNERS" button...
Test: N/A
Change-Id: Ia6f672d782be2bbae37285fb691eef57b17132d6
2021-09-23 14:03:55 -07:00
Treehugger Robot
760d9f0fa9
Merge "Add support to use preferred graphics backend" am: afab2aeb76
am: e53506a56f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835073
Change-Id: Ica27c6fa6ccc10398bd6a9a1c329ca298b9ddb4d
2021-09-23 21:03:30 +00:00
Kelvin Zhang
fe131174ea
Merge "Update OWNERS file" am: 7f8f3fcc33
am: 6011fcc875
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835393
Change-Id: I9e9c126a3bc54fbeb56bd65e5461acdb744a7db6
2021-09-23 21:03:22 +00:00
Elliott Hughes
f393cef86f
Warn on repo upload
if you're not uploading to AOSP master.
...
Should help save the "please upload against AOSP master" first
conversations with people trying to make changes.
Test: manual
Change-Id: I3d4bfcb0379da12a93e65a3621edda3bbde72a88
2021-09-23 14:02:10 -07:00
Treehugger Robot
e53506a56f
Merge "Add support to use preferred graphics backend" am: afab2aeb76
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835073
Change-Id: I37f4d569f4f2955fc405599b901aed921331d356
2021-09-23 20:45:23 +00:00
Kelvin Zhang
6011fcc875
Merge "Update OWNERS file" am: 7f8f3fcc33
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1835393
Change-Id: I3aa8df46a9f69adb08d45455dde2f290f22e6433
2021-09-23 20:45:06 +00:00
Treehugger Robot
afab2aeb76
Merge "Add support to use preferred graphics backend"
2021-09-23 20:42:08 +00:00
Kelvin Zhang
7f8f3fcc33
Merge "Update OWNERS file"
2021-09-23 20:27:46 +00:00
Kelvin Zhang
23080333f6
Update OWNERS file
...
zhaojiac@ is no longer in Android, removing him from owners list and add
myself.
Test: th
Change-Id: I0521d8689e52285e06d3989c4f20d87aca8450f8
2021-09-23 12:50:19 -07:00
Chihhang Chuang
6f7362ab7b
Add support to use preferred graphics backend
...
- Add #gr_init(backends) for users to use preferred graphics backend.
Bug: 196777741
Test: build, flash, and boot device.
Change-Id: I2621e879bbc7dce926a263a97a1013985d75592a
2021-09-24 03:21:55 +08:00
Bill Yi
b3a3983eaa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 76eeeea938
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15589125
Change-Id: I29c2e0a7c8e011d8f0218e78ff2405f16386b3d5
2021-08-17 20:21:43 +00:00
Xin Li
dea81b4162
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295
-s ours am: 47fb2759e4
-s ours
...
am skip reason: Merged-In I1503e40bd55ad8595965e407abeb2df9e1b183e4 with SHA-1 610c2e5814
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15571683
Change-Id: I88bc38c1079443da24fb5b24dee67dd9ae928dda
2021-08-17 19:46:03 +00:00
Xin Li
47fb2759e4
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 818495e295
-s ours
...
am skip reason: Merged-In I1503e40bd55ad8595965e407abeb2df9e1b183e4 with SHA-1 610c2e5814
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15571683
Change-Id: Id1e2e5fdcd9a24fbe0a1787758d6238834dd5617
2021-08-17 18:35:32 +00:00
Bill Yi
76eeeea938
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c1e751bbd5c404198f57d8e8bde4dbcbaa95f77
2021-08-16 19:55:22 -07:00
Xin Li
818495e295
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: I1503e40bd55ad8595965e407abeb2df9e1b183e4
Change-Id: Idd6cbea1c9120e195f6304bcb642ab48968bf858
2021-08-14 06:30:56 +00:00
Bill Yi
cf29fa5d10
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a
-s ours am: 2a4893e165
-s ours am: 10a84ddb05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550343
Change-Id: I43a248b42ec14ba96088b7f5f54ac4cf0bad40db
2021-08-13 22:16:33 +00:00
Bill Yi
2db026e6d7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a
-s ours am: 2a4893e165
-s ours am: 3c2ef0097f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550343
Change-Id: I6e0a68be394efdc0a333f95e3f81b4d1e572cfce
2021-08-13 22:15:43 +00:00
Bill Yi
10a84ddb05
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a
-s ours am: 2a4893e165
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550343
Change-Id: Ia43c199c908c1a7a0dac70f4f8758286eb1d8c74
2021-08-13 21:59:01 +00:00
Bill Yi
3c2ef0097f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a
-s ours am: 2a4893e165
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550343
Change-Id: I5d43d4e4f63a17b92280409240fa14dc136861ed
2021-08-13 21:57:09 +00:00
Bill Yi
2a4893e165
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24f04c872a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550343
Change-Id: I274016bc705ab26e882174b88611e90f06e466af
2021-08-13 21:36:34 +00:00
TreeHugger Robot
820d62990c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c2fa7449e
-s ours am: 81edc74fdc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: I698ff9af601602d885aaf91c9eac8e9c49454e61
2021-08-13 19:12:12 +00:00
TreeHugger Robot
7304340899
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c2fa7449e
-s ours am: 4dabcc9cbc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: Iee2ad6f5a6975c44efbbf124cad867b6cc2ace8f
2021-08-13 18:55:56 +00:00
TreeHugger Robot
680a1e7263
Merge changes from topic "presubmit-am-9c383cc1bdfa4a9aa3667800dd5e6d6f" into sc-dev-plus-aosp am: 4154dfc767
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: I8162b5f70ef2235fffe6afa5b48e0197ecac78c1
2021-08-13 18:55:02 +00:00
Bill Yi
bfb7b6adba
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 42bb37b4b3
am: 4ef479ba4f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: If8c8c14c70251153224c3dae9096cfa43d93c260
2021-08-13 18:55:01 +00:00
TreeHugger Robot
81edc74fdc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c2fa7449e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: Iee463f29e43df5614e97a88f14d3f7c6fd1f1b85
2021-08-13 18:54:39 +00:00
TreeHugger Robot
4dabcc9cbc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 2c2fa7449e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: If2f9c1f24a657b7c2b3290ce7ba1b3da4b93a96e
2021-08-13 18:53:34 +00:00
TreeHugger Robot
2c2fa7449e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:37:37 +00:00
TreeHugger Robot
4154dfc767
Merge changes from topic "presubmit-am-9c383cc1bdfa4a9aa3667800dd5e6d6f" into sc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 42bb37b4b3
Import translations. DO NOT MERGE ANYWHERE
2021-08-13 18:37:37 +00:00
Bill Yi
baddd12846
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours am: 98244a3368
-s ours am: 024b4276b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: I34db902617cb9e72a6180c1b320a19c454f63db8
2021-08-13 18:27:41 +00:00
Bill Yi
e550a6a37b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours am: 98244a3368
-s ours am: 69f4fc2072
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: Ief0b7e12f19c9626ee9cf75df184e4a2e4164ff7
2021-08-13 18:27:31 +00:00
Bill Yi
024b4276b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours am: 98244a3368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: I8f166db3b0a367932b82a1bbf7ed610d0d1e3bb3
2021-08-13 18:12:03 +00:00
Bill Yi
69f4fc2072
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours am: 98244a3368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: I98e01993e3346f4aed74e7040ef8c6b16f694afd
2021-08-13 18:10:57 +00:00
Bill Yi
98244a3368
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a86406ce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550348
Change-Id: Idbdf716187c2fd18f0f4b6484278f30f400b9254
2021-08-13 17:55:55 +00:00
Bill Yi
4ef479ba4f
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 42bb37b4b3
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/15550350
Change-Id: I277577f5893650f57dd6cc0c2ed1197f1adb567c
2021-08-13 01:45:19 +00:00
Bill Yi
42bb37b4b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib47aac206927e53d691f1069e3b752b0f89aac90
2021-08-13 01:45:10 +00:00