Commits · 029fc7ffa937aa42c371d7b670a427e20ce126f5 · LMODroid / platform_packages_inputmethods_LatinIME

Sep 11, 2020

[automerger skipped] Merge "Merge Android R" am: -s ours am:... · 029fc7ff

Xin Li authored 4 years ago

[automerger skipped] Merge "Merge Android R" am: c65e16db -s ours am: 4908f9ae -s ours am: e2a6086b -s ours

am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755cca is in history

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510

Change-Id: I1362f20646ccdb11a15df1eb73947764eba57928

029fc7ff

[automerger skipped] Merge "Merge Android R" am: -s ours am: -s ours · e2a6086b

Xin Li authored 4 years ago

am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755cca is in history

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510

Change-Id: If1dde117b9fc7e6fce93d62f9ee20ff67ccfd1ad

e2a6086b

[automerger skipped] Merge "Merge Android R" am: -s ours · 4908f9ae

Xin Li authored 4 years ago

am skip reason: Change-Id Ia56c511912ee213555b170faf292f1640d90cb75 with SHA-1 98755cca is in history

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1422510

Change-Id: Ifb0e8dbe8fe34b47cc18957462003375865382b6

4908f9ae

Sep 10, 2020
- Merge "Merge Android R" · c65e16db
  Xin Li authored 4 years ago
  
  c65e16db
Sep 08, 2020

Merge Android R · 60be45ec

Xin Li authored 4 years ago

Bug: 168057903
Merged-In: Ia56c511912ee213555b170faf292f1640d90cb75
Change-Id: Id2ed98b896c8f23246df31fead70c94e764aab97

60be45ec

Sep 01, 2020

[automerger skipped] Merge Android R... · 89a158c1

Xin Li authored 4 years ago

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755cca -s ours am: ded6b22f -s ours

am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255

Change-Id: I61c68204b62b3e6dd93e6600900c2a5c1520c857

89a158c1

[automerger skipped] Merge Android R... · ded6b22f

Xin Li authored 4 years ago

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 98755cca -s ours

am skip reason: Change-Id Ic072c06935a52c466d43fe4787cee7c7da73756c with SHA-1 67bb31cf is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/12470255

Change-Id: Ic33e106283dedb15e2553222690608f112cdf275

ded6b22f

Aug 27, 2020

Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) · 98755cca

Xin Li authored 4 years ago

Bug: 166295507
Merged-In: Ic072c06935a52c466d43fe4787cee7c7da73756c
Change-Id: Ia56c511912ee213555b170faf292f1640d90cb75

98755cca

Aug 13, 2020

Merge "Update LatinIME to comply with Android's inclusive language guidance"... · 86727e6b

Adrian Roos authored 4 years ago

Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e71 am: dcf1ecf7 am: 188b10a3

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188

Change-Id: I01cb309f71af6a6b6ec0889b4618926722e3b6fa

86727e6b

Merge "Update LatinIME to comply with Android's inclusive language guidance"... · 188b10a3

Adrian Roos authored 4 years ago

Merge "Update LatinIME to comply with Android's inclusive language guidance" am: 33fa7e71 am: dcf1ecf7

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188

Change-Id: I1b9fe45a2b45645c33c1901b6aaba401a2d439f7

188b10a3

Merge "Update LatinIME to comply with Android's inclusive language guidance" am: · dcf1ecf7

Adrian Roos authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1398188

Change-Id: I1f6a3172d69957c82840635c68820b3aff98f8bf

dcf1ecf7

Merge "Update LatinIME to comply with Android's inclusive language guidance" · 33fa7e71
Adrian Roos authored 4 years ago

33fa7e71

Aug 12, 2020

Update LatinIME to comply with Android's inclusive language guidance · 444da564

Adrian Roos authored 4 years ago

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 162536543
Change-Id: I5df9e60ec6caa2e1e3253532c2b59b74adfc1749

444da564

Jul 31, 2020

Merge "Update language to comply with Android’s inclusive language guidance"... · ccfef108

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678c am: 6fc67acb am: 94047a03

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237

Change-Id: Idac165021a2a4835aaefeff5dc4aa9086f91015b

ccfef108

Merge "Update language to comply with Android’s inclusive language guidance"... · 94047a03

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android’s inclusive language guidance" am: b01f678c am: 6fc67acb

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237

Change-Id: Idb33c914d97c7cea11200c96aec716b5f469a190

94047a03

Merge "Update language to comply with Android’s inclusive language guidance" am: · 6fc67acb

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371237

Change-Id: I5a54bf19ea1ba28abfc4e4451f23bc008749b344

6fc67acb

Merge "Update language to comply with Android’s inclusive language guidance" · b01f678c
Treehugger Robot authored 4 years ago

b01f678c

Update language to comply with Android’s inclusive language guidance · 0c549e74

Seigo Nonaka authored 4 years ago

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: tapas LatinIME && m
Change-Id: Ic06f948c023a091e1532db826a78dd01031d7205

0c549e74

Merge "Update language to comply with Android's inclusive language guidance"... · 994774eb

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b9 am: 892eabe4 am: a2581fb8

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602

Change-Id: Ia2ead878ea92eeed5048cf2cbfa6c2a80b8c6b20

994774eb

Merge "Update language to comply with Android's inclusive language guidance"... · a2581fb8

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android's inclusive language guidance" am: 9490b1b9 am: 892eabe4

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602

Change-Id: I97c7ce3619bbb6570117d9aad43f18ffa2664059

a2581fb8

Merge "Update language to comply with Android's inclusive language guidance" am: · 892eabe4

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1382602

Change-Id: Ie77533b68469bf4018bffdecda72792fe89aba71

892eabe4

Merge "Update language to comply with Android's inclusive language guidance" · 9490b1b9
Treehugger Robot authored 4 years ago

9490b1b9

Update language to comply with Android's inclusive language guidance · 1d9bf420

Jeff Sharkey authored 4 years ago

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: I171bc299e660f96f20041a67a3052bd8a2ed781c

1d9bf420

Jul 23, 2020

Merge "Update language to comply with Android’s inclusive language guidance"... · 9ebba46c

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb19221 am: a2695d0c am: a61e424d

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236

Change-Id: I59c0f66bf37497f687d45d7a56e837eecda26c11

9ebba46c

Merge "Update language to comply with Android’s inclusive language guidance"... · a61e424d

Treehugger Robot authored 4 years ago

Merge "Update language to comply with Android’s inclusive language guidance" am: 4eb19221 am: a2695d0c

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236

Change-Id: Id1960131ce017f0a46dffc917d29b171a231472a

a61e424d

Merge "Update language to comply with Android’s inclusive language guidance" am: · a2695d0c

Treehugger Robot authored 4 years ago

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/1371236

Change-Id: Ie132872cad36f2fa2b28eec2be7b4bb148e55d7f

a2695d0c

Merge "Update language to comply with Android’s inclusive language guidance" · 4eb19221
Treehugger Robot authored 4 years ago

4eb19221

Jul 22, 2020

Update language to comply with Android’s inclusive language guidance · f53e034a

Seigo Nonaka authored 4 years ago

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: tapas LatinIME && m
Change-Id: I2ffb39ff70f61e579b62761d3da526a545dead1f

f53e034a

Apr 28, 2020
- Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e3 am: daadf710 am: 67bb31cf · 99e43298
  Treehugger Robot authored 4 years ago
  
  Change-Id: I662435df33fa3d22d97ac61b0c8c24b5cac05c41
  99e43298
- Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e3 am: daadf710 · 67bb31cf
  Treehugger Robot authored 4 years ago
  
  Change-Id: Ic072c06935a52c466d43fe4787cee7c7da73756c
  67bb31cf
- Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" am: fa1093e3 · daadf710
  Treehugger Robot authored 4 years ago
  
  Change-Id: I4d86ad8ff2bdaf690c74fff1141542cf9e44a510
  daadf710
- Merge "Remove MODULE_LICENSE_APACHE2 from LatinIME" · fa1093e3
  Treehugger Robot authored 4 years ago
  
  fa1093e3
- Remove MODULE_LICENSE_APACHE2 from LatinIME · 349a1ce4
  Bob Badour authored 4 years ago
  
  Repositories containing third-party code need a METADATA and a license_type. Repositories containing only first-party code no longer need a MODULE_LICENSE_* file. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I1ace00753e03c6c09d63b8c509fde95d44b98739
  349a1ce4
Apr 15, 2020
- Merge "Add explicit dependencies on jni_headers" am: d3af5a28 am: aab67ba1 am: e04cfb09 · 3b8eaf98
  Treehugger Robot authored 4 years ago
  
  Change-Id: I2db6a95a1e295ea800b29c6018d2badf3138a5cb
  3b8eaf98
- Merge "Add explicit dependencies on jni_headers" am: d3af5a28 am: aab67ba1 · e04cfb09
  Treehugger Robot authored 4 years ago
  
  Change-Id: I6d376cc2492ed2969c85a72f4456d3711db2f72a
  e04cfb09
- Merge "Add explicit dependencies on jni_headers" am: d3af5a28 · aab67ba1
  Treehugger Robot authored 4 years ago
  
  Change-Id: Ibc27e9196b7bc9328e465a90c685b9c05460718e
  aab67ba1
- Merge "Add explicit dependencies on jni_headers" · d3af5a28
  Treehugger Robot authored 4 years ago
  
  d3af5a28
Apr 13, 2020

Add explicit dependencies on jni_headers · 54c4f2af

Orion Hodson authored 4 years ago

Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: Ib36e679819a3309ccbf12fd592309b16c8bbd6c8

54c4f2af

Apr 10, 2020

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · f92b2696

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2474a95a -s ours am: f5345e8d

Change-Id: Icc05b2971ccb3b999399018c8ee220ec2b5d5a36

f92b2696

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into... · f5345e8d

Xin Li authored 4 years ago

[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 2474a95a -s ours

am skip reason: subject contains skip directive

Change-Id: I7bb35d14fbd3e03bfa2b268d69bb63394644994a

f5345e8d