Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
659,479 Commits 3 Branches 0 Tags
af1ad1bf3c0b60cac3bb001fe331b499ea6250ab
Commit Graph

659479 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
af1ad1bf3c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: I7475abd8194d963ea6f3a6c401f70e0c46f3ccbc
 2021-09-29 17:22:19 +00:00
Bill Yi
832ba928c6 Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:09:50 +00:00
Bill Yi
75afb515a1 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-29 17:09:06 +00:00
Bill Yi
9b46036861 Merge changes from topic "presubmit-am-299a8c0ab3d74eefa0a5487bc3c9a9c8" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:09:06 +00:00
Bill Yi
2cd730a393 Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-29 17:08:48 +00:00
Bill Yi
14ce8a0693 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-29 17:08:33 +00:00
Bill Yi
af1dea1064 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-29 17:07:42 +00:00
TreeHugger Robot
398ec6322b Merge "create library for mainline module" into sc-mainline-prod 2021-09-29 10:52:49 +00:00
Bill Yi
7e26ffa5f3 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d98d166893 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936763

Change-Id: Iae953c450f519a44f2db20a468c22c97b5d1b57c
 2021-09-29 00:27:18 +00:00
Bill Yi
d98d166893 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I10fc5272aabfdcb940433d19dca2977acece3ba3
 2021-09-29 00:26:58 +00:00
Bill Yi
c6adcf91f1 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2f8fd51b76 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311

Change-Id: Ib5ad57fa5ae27f8c4de3dbd61ecca4f21ea4ef3a
 2021-09-28 23:50:23 +00:00
Bill Yi
2f8fd51b76 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1db9e1ee4f24934d64fea4b66a0cc102d70254d8
 2021-09-28 23:50:11 +00:00
Bill Yi
dc46a28cb4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib727ebbd99071a4b89834153c1350992c94193e8
 2021-09-28 23:47:09 +00:00
Bill Yi
9c21f7268b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0a8806d07d 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603

Change-Id: Ife5eefcf5117466521cf566c5dc602988b47df05
 2021-09-28 20:27:38 +00:00
Bill Yi
0a8806d07d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45ed0eb4dd344e144d1e68c5333e7f5f88c9dabb
 2021-09-28 20:27:17 +00:00
Bill Yi
54ad86c419 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icf0aaa01c3119454ff651e5c2016da2b926e3ed6
 2021-09-28 20:03:20 +00:00
Bill Yi
7f851dd216 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6e3c154990 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918185

Change-Id: Idee9b05ed4fe6f9c5f5cfd5e06b53a4ab0304c4a
 2021-09-27 14:49:22 +00:00
Bill Yi
6e3c154990 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-27 14:32:51 +00:00
Bill Yi
c68a52845f Merge changes from topic "presubmit-am-1818a89739a448418e0c5e26a456a077" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4a8bd31415
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:32:51 +00:00
Bill Yi
3c6dc3019a Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3820a903ef
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-27 14:31:34 +00:00
Bill Yi
8051391c0e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-27 14:30:27 +00:00
Bill Yi
ef41dda076 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4a8bd31415 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15918185

Change-Id: Id08bc56df9cf996d5a804d38c2335cfc80104465
 2021-09-26 10:12:42 +00:00
Bill Yi
4a8bd31415 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I793e9c105c36cedff7c6fabdd6c63187cbf04b76
 2021-09-26 10:12:25 +00:00
Bill Yi
9795b30939 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idd1728263638d6d502520fe24ca13a2804fcfd23
 2021-09-26 09:49:46 +00:00
Bill Yi
9ccdd90622 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 3820a903ef 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15915585

Change-Id: I4e9bb8688ea98b4cd0b3f4bef866eb48e4d8f77b
 2021-09-26 03:45:22 +00:00
Bill Yi
3820a903ef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia3b3ed03742e13e8990890d5948199cfa73713fd
 2021-09-26 03:45:04 +00:00
Bill Yi
be717d569d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic0c349d5ee0688d9c6059fc236adcadb40ec64be
 2021-09-26 03:35:24 +00:00
TreeHugger Robot
7beb30b66a Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev am: d92e142ac4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888530

Change-Id: Idcb7bd4d5e0444d56d43c71b469a506af2d993eb
 2021-09-25 04:19:25 +00:00
Ming-Shin Lu
ebde3cf45a RESTRICT AUTOMERGE: More improve IME transition during task switch am: 5c23301322 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888530

Change-Id: I0ed9aeb3dea5cdfa285cc6e4723c68dba53cf48d
 2021-09-25 04:19:11 +00:00
TreeHugger Robot
d92e142ac4 Merge "RESTRICT AUTOMERGE: More improve IME transition during task switch" into sc-dev 2021-09-25 04:00:43 +00:00
Bill Yi
afefe9a2b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8cb6e80e2d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901081

Change-Id: I1441be3cee3b6eabf1b872a27b1646b989ec04bf
 2021-09-24 22:49:58 +00:00
Bill Yi
e60b2ab039 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d73fcd72c3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068

Change-Id: I5d7b41aca6f9aae2c4dd2368dc69e41f3753e825
 2021-09-24 22:49:46 +00:00
Bill Yi
039a694f0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 24f4aada7a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897823

Change-Id: Ia5c8f3c4845f7694f56c3fc64a233bccedcf045a
 2021-09-24 22:49:03 +00:00
Bill Yi
8cb6e80e2d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 22:31:38 +00:00
Bill Yi
d28621d6a6 Merge changes from topic "presubmit-am-22095588cfca4cccb6de704ccd95f743" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 063bcacc7a
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 22:31:38 +00:00
Bill Yi
d73fcd72c3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 22:31:16 +00:00
Bill Yi
c2636fc401 Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7c2a77f598
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 22:31:16 +00:00
Bill Yi
24f4aada7a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 22:30:49 +00:00
Bill Yi
615bd95dbe Merge changes from topic "presubmit-am-467044d56f244cb485cb4cd61eb97b47" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 70fd54fa14
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 22:30:49 +00:00
Bill Yi
e34ba2ab0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 939547f7f5 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898290

Change-Id: Ifa5b88af998c3fa18a504da021621df5ffce3019
 2021-09-24 20:38:00 +00:00
Bill Yi
ba01178cff Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-09-24 20:23:46 +00:00
Bill Yi
939547f7f5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 20:23:34 +00:00
Bill Yi
a3d589046b Merge changes from topic "presubmit-am-bf2c168d3e474b609f72a06f73ec50e2" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 060aa2513b
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 20:23:34 +00:00
Bill Yi
fbd81a5574 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 08321e32d7 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901067

Change-Id: I8e37cfc73c04e3f74b78c71c1890fdfadf7d6923
 2021-09-24 19:00:02 +00:00
Bill Yi
5d2dfac33a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4f66623be8 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901610

Change-Id: Idbeb31c479c311413f7451f783b78c45535239c8
 2021-09-24 18:59:13 +00:00
Bill Yi
318c29bb78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7be5cdf97d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902916

Change-Id: Ic53feb1d96df55b9625078d37dea49cca20b99c9
 2021-09-24 18:59:01 +00:00
Bill Yi
08321e32d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 18:45:28 +00:00
Bill Yi
d4696e7009 Merge changes from topic "presubmit-am-a0f887f302784f8c86331d3e0819fa21" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7e4db7ac6c
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 18:45:28 +00:00
Bill Yi
4f66623be8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-24 18:45:19 +00:00
Bill Yi
14317c66a3 Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: b33cc8091c
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-24 18:45:19 +00:00