Bill Yi
bcf2e35cc9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 35ac417ae0
-s ours
...
am: 8c9163d180
-s ours
am skip reason: subject contains skip directive
Change-Id: I947826e9c2224d223d526c96c64dc4f5ca2c3251
2019-02-21 12:24:03 -08:00
Bill Yi
ae2e603370
[automerger skipped] Import translations. DO NOT MERGE am: 9e73c487e4
-s ours
...
am: 1079e974a3
-s ours
am skip reason: subject contains skip directive
Change-Id: Icfb741e61c196da6ada12373682ed5ac16d045b2
2019-02-21 12:13:38 -08:00
TreeHugger Robot
769f5d069d
Merge "Import translations. DO NOT MERGE"
2019-02-21 19:50:52 +00:00
TreeHugger Robot
4dc4196a34
Merge "Import translations. DO NOT MERGE"
2019-02-21 19:37:35 +00:00
TreeHugger Robot
3213f8bfa4
Merge "Import translations. DO NOT MERGE"
2019-02-21 19:23:21 +00:00
Bill Yi
d2a0448138
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 289a72634b
-s ours
am skip reason: subject contains skip directive
Change-Id: I4b8e3e2002bef629f14c741ffdf26f9f585ae4cf
2019-02-21 11:17:35 -08:00
Bill Yi
6c7f0252df
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 624bac2cd8
-s ours
am skip reason: subject contains skip directive
Change-Id: I39a6eb25425d7d6a5d9f0b9b6c93d398aec3d7ce
2019-02-21 11:17:13 -08:00
Bill Yi
ecce81d600
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: a921223fe2
-s ours
am skip reason: subject contains skip directive
Change-Id: I27620645836d7e3e26894cbbff72e92cd1e54d9d
2019-02-21 11:16:51 -08:00
Bill Yi
151132139a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 01900e65fc
-s ours
am skip reason: subject contains skip directive
Change-Id: I01f062132b5b6b40de3f532a0b4c48da14ffa0c9
2019-02-21 11:16:28 -08:00
Bill Yi
1513b865a7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: e951835344
-s ours
am skip reason: subject contains skip directive
Change-Id: I9b53ac21775b9611c5eb407f9619f51851b55aea
2019-02-21 11:16:11 -08:00
Bill Yi
8c9163d180
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 35ac417ae0
-s ours
am skip reason: subject contains skip directive
Change-Id: Iddece47182ff08386f7bcaa402c74eeaca57a693
2019-02-21 11:15:30 -08:00
Bill Yi
1079e974a3
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9e73c487e4
-s ours
am skip reason: subject contains skip directive
Change-Id: I36af548ea6984fda2645809575e5b9566b163308
2019-02-21 11:13:23 -08:00
TreeHugger Robot
289a72634b
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:47:25 +00:00
TreeHugger Robot
624bac2cd8
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:36:34 +00:00
TreeHugger Robot
a921223fe2
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:32:55 +00:00
TreeHugger Robot
01900e65fc
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:30:35 +00:00
TreeHugger Robot
e951835344
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:29:46 +00:00
TreeHugger Robot
35ac417ae0
Merge "Import translations. DO NOT MERGE" into pi-dev
2019-02-21 18:23:15 +00:00
Xin Li
c6989a55f8
DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
Bug: 120848293
Change-Id: I0ce28bf5229c1f1c98a51d86c2eaa15ec9efa73e
2019-02-21 09:25:08 -08:00
Bill Yi
9e73c487e4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2b984642494033f59d02cf4c640793b47e63c6b3
2019-02-21 06:21:12 -08:00
Bill Yi
141c72a1dc
Import translations. DO NOT MERGE
...
Change-Id: I48a6f3055d8dd3182ff98a6edace3a4e35b4326d
Auto-generated-cl: translation import
2019-02-21 06:20:27 -08:00
Bill Yi
621f24c948
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I7809654384cc42e87999e222316e25f4bd70641f
2019-02-21 06:17:52 -08:00
Bill Yi
49f35d15be
Import translations. DO NOT MERGE
...
Change-Id: Icdaeac3123fef5ca97a44cc155d4f428138ae985
Auto-generated-cl: translation import
2019-02-21 06:17:12 -08:00
Bill Yi
463afb44e2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I136d94f85222806b5104a16b6d544dc1c377c5e3
2019-02-21 06:12:24 -08:00
Bill Yi
c57cda4a3a
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6e496165fde5ea66dda1559f39a0c02c949265b0
2019-02-21 06:08:02 -08:00
Bill Yi
58f382cb84
Import translations. DO NOT MERGE
...
Change-Id: Iaaf42624b7933d8a479a9eea71aedbc3711de6cb
Auto-generated-cl: translation import
2019-02-21 06:06:58 -08:00
Bill Yi
42f8490ea3
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ied44fc2e6b9256a6744387ca511946b21fd44524
2019-02-21 06:04:26 -08:00
Bill Yi
685f412885
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9edb7e3ebf58bdf8fe5b12096c37815e58a39e40
2019-02-21 06:01:44 -08:00
Bill Yi
f82540f2d4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I05cf27d7d1a197dde37d6dc69433c26e62c88458
2019-02-21 05:59:00 -08:00
Bill Yi
ba59aeb8e1
Import translations. DO NOT MERGE
...
Change-Id: I3962401c95664f199216b443e27bf07871b20d07
Auto-generated-cl: translation import
2019-02-21 05:58:22 -08:00
Xin Li
d9bad632d5
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 7a26716635
-s ours am: 3131e40bd0
-s ours
...
am: e4b43c4fbc
-s ours
am skip reason: subject contains skip directive
Change-Id: I79afcd68f3c86d5ca5a883ac57f350022c829762
2019-02-20 12:16:55 -08:00
Xin Li
e4b43c4fbc
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: 7a26716635
-s ours
...
am: 3131e40bd0
-s ours
am skip reason: subject contains skip directive
Change-Id: If88ba09f1f42f81715f1fc058056f30260a27f76
2019-02-20 11:48:02 -08:00
Xin Li
3131e40bd0
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: 7a26716635
-s ours
am skip reason: subject contains skip directive
Change-Id: I987ab9b831b98585ec81dfb09ef7c2a9e231050c
2019-02-20 11:09:54 -08:00
Xin Li
45c359f65f
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 55f3303cbb
-s ours am: 44fd4cee32
-s ours
...
am: d89fe26246
-s ours
am skip reason: subject contains skip directive
Change-Id: Id282955f43ad4f89dcb9ed86a4d8d9bd319b400a
2019-02-20 10:17:00 -08:00
Xin Li
d89fe26246
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 55f3303cbb
-s ours
...
am: 44fd4cee32
-s ours
am skip reason: subject contains skip directive
Change-Id: I39de5a3e6d74ff3c40509fb86b20ed58a0fa2c00
2019-02-20 09:29:40 -08:00
Xin Li
44fd4cee32
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 55f3303cbb
-s ours
am skip reason: subject contains skip directive
Change-Id: I6b4a32fb876ebb56043708b575cbf72b870617b8
2019-02-20 08:53:05 -08:00
Xin Li
7a26716635
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:25:59 +00:00
Xin Li
55f3303cbb
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: I7e1e95d48518ba22d651ac5301f59d0576eae5f3
2019-02-18 15:58:48 -08:00
Xin Li
15a552b391
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: edb32289f2
-s ours
...
am: 69d7bc2bc2
-s ours
am skip reason: subject contains skip directive
Change-Id: I5167f411100785ed9a9e1355d5e2cfbea6878e13
2019-02-14 21:09:48 -08:00
Xin Li
69d7bc2bc2
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: edb32289f2
-s ours
am skip reason: subject contains skip directive
Change-Id: Ideb2a4ae6b8035057793c5b6a8f23fb823bc6930
2019-02-14 14:42:16 -08:00
Xin Li
edb32289f2
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I7cf7739a6a70d4caeb1c20a3c1c4f33a05568670
2019-02-12 09:53:45 -08:00
android-build-team Robot
20de0ce610
Snap for 5180536 from 556b091a75
to pi-platform-release
...
Change-Id: I0d7de023eac68880bab0b670385e67b721a5abcf
2019-02-09 02:34:49 +00:00
Bill Yi
1a39f585b1
Import translations. DO NOT MERGE
...
Change-Id: If684531601502dce2fa4c0fe36a1af2086226faa
Auto-generated-cl: translation import
2019-02-07 20:57:21 -08:00
Yohei Yukawa
bdf7d6f56d
Support testing Direct Reply with EditTextVariations on API 24/25
...
This is a follow up CL to my previous CL [1], which enabled us to test
Direct-Reply with EditTextVariations.
What this CL does are:
* Specyfing min_sdk_version to avoid INSTALL_FAILED_OLDER_SDK error
when installing on older devices.
* Avoiding NoSuchMethodError on pre-O devices where
Notification.Builder does not have a constructor that takes
notification channel.
* Fixing a race condition where notification can be sent before
notification channel is created.
[1]: Iafffcc7d138b0f502116a5e557f0c3f17e9d0b73
da2486fd63
Bug: 122957841
Test: Made sure that we can install EditTextVariations on N devices
and "Direct-Reply" on EditTextVariations works there.
Change-Id: Ib4fbd447608b111e763fde4287226cf7e206e65e
2019-02-05 22:46:42 -08:00
TreeHugger Robot
a55797bfba
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:39:35 +00:00
TreeHugger Robot
5efe640eee
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:39:33 +00:00
TreeHugger Robot
90026f50fb
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:36:35 +00:00
TreeHugger Robot
c4918159e8
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:34:39 +00:00
TreeHugger Robot
0b66f7e9ff
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:32:37 +00:00
TreeHugger Robot
f9bab82514
Merge "Import translations. DO NOT MERGE"
2019-02-02 17:29:40 +00:00