Automerger Merge Worker
c1ae6aa1aa
Merge "Merge Android10 QPR1 into AOSP master" am: e5aad47755
am: ddcf093505
...
Change-Id: If73065e6effd5fc16c213d3dca4b97ff7f143edb
2019-12-04 16:58:03 +00:00
Xin Li
ddcf093505
Merge "Merge Android10 QPR1 into AOSP master" am: e5aad47755
...
am: e8d02cca96
Change-Id: I21c4221a0672c53ad5df2320e32dec6b3b0bc8af
2019-12-04 08:14:38 -08:00
Xin Li
e8d02cca96
Merge "Merge Android10 QPR1 into AOSP master"
...
am: e5aad47755
Change-Id: Ib528c98b6785319391f70e7de23d260edaefcff6
2019-12-03 16:14:43 -08:00
Treehugger Robot
e5aad47755
Merge "Merge Android10 QPR1 into AOSP master"
2019-12-03 23:15:02 +00:00
Xin Li
54e703cc10
Merge Android10 QPR1 into AOSP master
...
Bug: 145570283
Change-Id: I02ff250b4fb612a4b88e91a4bb0ef469adf30bc4
2019-12-02 21:25:22 -08:00
Alex Henrie
b012dd4284
Merge "Support polytonic Greek diacritics in the Greek keyboard" am: f64e2769b7
am: fa276af7df
...
am: 9b45f98e23
Change-Id: I9e2f744204ceae36d092d2b95526e5c956f7c14f
2019-11-25 19:00:33 -08:00
Alex Henrie
9b45f98e23
Merge "Support polytonic Greek diacritics in the Greek keyboard" am: f64e2769b7
...
am: fa276af7df
Change-Id: Ib3fbb58c4cdf59f6d0373d662bbd8f5ddf36f105
2019-11-25 18:58:08 -08:00
Alex Henrie
fa276af7df
Merge "Support polytonic Greek diacritics in the Greek keyboard"
...
am: f64e2769b7
Change-Id: I1a18716ff46f0d9aae119941d426ea1d778a5407
2019-11-25 18:55:11 -08:00
Treehugger Robot
f64e2769b7
Merge "Support polytonic Greek diacritics in the Greek keyboard"
2019-11-26 02:42:31 +00:00
TreeHugger Robot
0ef462a0d3
Merge "Import translations. DO NOT MERGE"
2019-11-10 15:37:44 +00:00
TreeHugger Robot
b8b6774841
Merge "Import translations. DO NOT MERGE"
2019-11-10 15:37:32 +00:00
TreeHugger Robot
3e9889e0bf
Merge "Import translations. DO NOT MERGE"
2019-11-10 15:33:31 +00:00
Bill Yi
3f9169604b
Import translations. DO NOT MERGE
...
Change-Id: I2688babc5d396ae65481a97b186e52c7c3dafbc9
Auto-generated-cl: translation import
2019-11-10 03:00:17 -08:00
Bill Yi
8027df8ddb
Import translations. DO NOT MERGE
...
Change-Id: I237d2997fb1314302be85530c6b6bc710426b36b
Auto-generated-cl: translation import
2019-11-10 02:59:09 -08:00
Bill Yi
c7d75c69d8
Import translations. DO NOT MERGE
...
Change-Id: Iee2e651ebfd028b235b428939964b1b532427e78
Auto-generated-cl: translation import
2019-11-10 02:57:21 -08:00
Bill Yi
edb5207e2b
Import translations. DO NOT MERGE
...
Change-Id: I5f46ed0024412fbf2b1e5d549ac4f5747ba10ead
Auto-generated-cl: translation import
2019-11-10 02:56:17 -08:00
Bill Yi
ac867cf7ed
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 891e9bad07
-s ours
...
am: c98755cd39
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic76c0f069dbd44bf5ba6c1299d34809e0f4a062f
2019-11-09 08:08:27 -08:00
Bill Yi
c98755cd39
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 891e9bad07
-s ours
am skip reason: subject contains skip directive
Change-Id: Ic764fd53fed12834d6e0291f17fc72e66fb5dc3d
2019-11-09 08:04:10 -08:00
Bill Yi
b31f499e90
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a047102265
-s ours
...
am: fb337911b8
-s ours
am skip reason: subject contains skip directive
Change-Id: I609844af08d5ea60d781c88486217aff17c997ba
2019-11-09 07:45:53 -08:00
TreeHugger Robot
891e9bad07
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-11-09 15:43:04 +00:00
Bill Yi
1faa823150
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a9761dd09f
-s ours
...
am: ed4461afd4
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a1d8965ea9f181c7b014dead2472ca07548acbd
2019-11-09 07:42:40 -08:00
Bill Yi
93b5d2cc73
[automerger skipped] Import translations. DO NOT MERGE am: 0d0e8bf980
-s ours
...
am: 79be37cee6
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibf7e51228ff15988ab94944efc3138deed1efd41
2019-11-09 07:41:51 -08:00
Bill Yi
fb337911b8
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: a047102265
-s ours
am skip reason: subject contains skip directive
Change-Id: Idb22f32cb15c1ba9f4917ea2886ac16b127353a5
2019-11-09 07:41:23 -08:00
Bill Yi
ed4461afd4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: a9761dd09f
-s ours
am skip reason: subject contains skip directive
Change-Id: I9914a4fe4a5f7bfc909bf97f60d9c36f3fbed4f4
2019-11-09 07:39:01 -08:00
Bill Yi
79be37cee6
[automerger skipped] Import translations. DO NOT MERGE
...
am: 0d0e8bf980
-s ours
am skip reason: subject contains skip directive
Change-Id: Id1fe14eccc7ee8f1a4c7b70358d607d0108ab331
2019-11-09 07:38:00 -08:00
TreeHugger Robot
a047102265
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-11-09 15:34:29 +00:00
TreeHugger Robot
a9761dd09f
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-11-09 15:31:27 +00:00
Bill Yi
a921c2d34a
Import translations. DO NOT MERGE
...
Change-Id: I81bb93f802d6207d6a635ef20d3cf14b8fe63736
Auto-generated-cl: translation import
2019-11-09 01:16:47 -08:00
Bill Yi
0d0e8bf980
Import translations. DO NOT MERGE
...
Change-Id: I5b95f6ad5e3e70baa6ac48af90d371436cbdc4db
Auto-generated-cl: translation import
2019-11-09 01:15:41 -08:00
Bill Yi
90c454f964
Import translations. DO NOT MERGE
...
Change-Id: I05c0b930c3ad4874427948f3c7edced4c8d0a838
Auto-generated-cl: translation import
2019-11-09 01:13:53 -08:00
Bill Yi
c9332c48cd
Import translations. DO NOT MERGE
...
Change-Id: Ie07900be31c3c8d19e858a8abbb1193bc431da0f
Auto-generated-cl: translation import
2019-11-09 01:12:46 -08:00
Bill Yi
845fcbc15a
Merge "Import translations. DO NOT MERGE"
2019-11-01 19:34:00 +00:00
Xin Li
60d289d2ab
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 5de808a6d0
...
am: 17e68a31e5
-s ours
am skip reason: subject contains skip directive
Change-Id: I2a85fd11ccab732858bae5e793e21f64ada26260
2019-10-31 14:08:58 -07:00
Xin Li
17e68a31e5
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: 5de808a6d0
Change-Id: Icac694e26b1b14ff2c461bda7b5bea71527a6c96
2019-10-31 13:22:04 -07:00
Bill Yi
20879d29dc
Import translations. DO NOT MERGE
...
Change-Id: I096635ffb38bb645e04c4ed143cece7ce68b6ddc
Auto-generated-cl: translation import
2019-10-30 22:14:41 -07:00
Xin Li
5de808a6d0
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I7c7e27c71119341c8cafeb315788cf44b467c31b
2019-10-30 11:50:06 -07:00
TreeHugger Robot
b1e4431c4a
Merge "Import translations. DO NOT MERGE"
2019-10-27 20:49:14 +00:00
Bill Yi
8bb8bf356b
Import translations. DO NOT MERGE
...
Change-Id: Ia7e18aa418d665e934f39dfbebb4696a10fd129a
Auto-generated-cl: translation import
2019-10-27 11:34:47 -07:00
Xin Li
59183a0efd
[automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49
-s ours am: 2b7ba7e4af
-s ours am: 229f77abff
-s ours
...
am: 28dec7e440
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: Icfd2cdbb65cd7f9284053672a9ef2f2fc3584253
2019-10-26 22:54:19 -07:00
Xin Li
28dec7e440
[automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49
-s ours am: 2b7ba7e4af
-s ours
...
am: 229f77abff
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: I98e315748dabd08af795d588ad4bc7fbea2bd8bd
2019-10-26 22:46:13 -07:00
Xin Li
229f77abff
[automerger skipped] Merge Coral/Flame into AOSP master am: edd21ffb49
-s ours
...
am: 2b7ba7e4af
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: I7fa7159bb18295b7de072d4769118df186e8b2e8
2019-10-26 22:37:35 -07:00
Xin Li
2b7ba7e4af
[automerger skipped] Merge Coral/Flame into AOSP master
...
am: edd21ffb49
-s ours
am skip reason: change_id I4af5f825051fb85e4c6d58f310d9209036c63ea8 with SHA1 c8782e216f
is in history
Change-Id: I50ae1a452471407dd779e039f192d4ec95c12a1c
2019-10-26 22:21:11 -07:00
Xin Li
edd21ffb49
Merge Coral/Flame into AOSP master
...
Bug: 141248619
Change-Id: I66aa50b606f3284d1a431f50cd6cae7574aab4a5
Merged-In: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-25 10:28:07 -07:00
Xin Li
c6ec399a6e
Skip QD1A.190821.011 in stage-aosp-master am: c8782e216f
am: 0de2363a6f
...
am: 65537e4758
Change-Id: Ic0e2fb79c884711caa5f40f2ba29a7f2c2dcc6eb
2019-10-23 16:01:24 -07:00
Xin Li
65537e4758
Skip QD1A.190821.011 in stage-aosp-master am: c8782e216f
...
am: 0de2363a6f
Change-Id: Icbb4e2aaaa006902e5d0107803e39b7b83d18184
2019-10-23 15:41:15 -07:00
Xin Li
0de2363a6f
Skip QD1A.190821.011 in stage-aosp-master
...
am: c8782e216f
Change-Id: I4b98af1ff11fbc56e4fe2c5511f4db341ad28b07
2019-10-23 15:22:01 -07:00
Bill Yi
6c130fb1fa
Import translations. DO NOT MERGE
...
Change-Id: I82449a197920db5447cdf46cc3f7f4f2549d949d
Auto-generated-cl: translation import
2019-10-19 03:47:32 -07:00
Xin Li
c8782e216f
Skip QD1A.190821.011 in stage-aosp-master
...
Bug: 141248619
Change-Id: I4af5f825051fb85e4c6d58f310d9209036c63ea8
2019-10-16 15:19:27 -07:00
Alex Henrie
0cf4376826
Support polytonic Greek diacritics in the Greek keyboard
...
Although modern Greek is typically written with only acute accent marks,
polytonic diacritics are still used by the Greek orthodox church, the
Greek newspaper Estia, and students of classical Greek texts. Supporting
these special characters is helpful to all of those groups.
Note that for the short vowels (epsilon, upsilon, iota, and omicron) all
of the diacritics permitted on lowercase letters are also permitted on
their uppercase forms. However, for the long vowels (alpha, eta, and
omega) the diacritics permitted on uppercase letters are a subset of the
diacritics permitted on lowercase letters. That's just how Greek is.
Test: Manually turned on the Greek (Greece) keyboard in the aosp_x86-eng
emulator and tried out all the new characters with Shift, with Shift
Lock, and without any modifiers.
Bug: 142007431
Change-Id: Iec4a82cab02aea5176721e8447f7dfdba46bacb3
2019-10-13 17:36:45 -06:00
Bill Yi
a3b0683a17
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 7604e64ecc
-s ours am: 48fd3d016a
-s ours am: a68bdf59af
-s ours
...
am: bc508606fc
-s ours
am skip reason: subject contains skip directive
Change-Id: Ib702b9e34fde23353055aa9915b9fca8249d6280
2019-10-12 13:26:19 -07:00