Bill Yi
|
6d90946e08
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fff12f831d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14287128
Change-Id: I66612ae59af080f0e958bda4b6b34db48fc76f2f
|
2021-04-23 02:29:31 +00:00 |
|
Xusong Wang
|
33be8eec88
|
Merge changes from topic "rs-deprecation" am: 67485cf930 am: 9b5047f696
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499
Change-Id: Ib4d54fc2149f9a1289975c71ba2465a4702185b2
|
2021-04-23 02:13:22 +00:00 |
|
Xusong Wang
|
2bf7341ecb
|
Deprecate RS Java APIs. am: 1f8dc651a8 am: 06287994ec
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683498
Change-Id: I4cf34e687eb12b192740bab30197c37d10ce00e9
|
2021-04-23 02:13:19 +00:00 |
|
Xusong Wang
|
9b5047f696
|
Merge changes from topic "rs-deprecation" am: 67485cf930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683499
Change-Id: I800ecc51dfd2c9972f5ab23938df4eb6f2a4c3f0
|
2021-04-23 01:46:12 +00:00 |
|
Xusong Wang
|
06287994ec
|
Deprecate RS Java APIs. am: 1f8dc651a8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683498
Change-Id: I823539a725e083870cf734e45c254a97da982ee5
|
2021-04-23 01:41:33 +00:00 |
|
Xusong Wang
|
67485cf930
|
Merge changes from topic "rs-deprecation"
* changes:
Silence compiler errors because of renderscript deprecation.
Deprecate RS Java APIs.
|
2021-04-23 01:16:04 +00:00 |
|
Varun Shah
|
49548d9faf
|
Merge "Update OWNERS for Content* framework." am: 81f00f0198 am: 44b972b1f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665999
Change-Id: Ibc5335fff06db5205ebf8ced5fa0a2ba76225cf1
|
2021-04-23 00:40:00 +00:00 |
|
Varun Shah
|
44b972b1f7
|
Merge "Update OWNERS for Content* framework." am: 81f00f0198
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1665999
Change-Id: If3a743e98296aacffb924d65649723ae07b6a591
|
2021-04-23 00:20:33 +00:00 |
|
Varun Shah
|
81f00f0198
|
Merge "Update OWNERS for Content* framework."
|
2021-04-22 23:59:17 +00:00 |
|
Bill Yi
|
fff12f831d
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0d615771a15993e85b742777d9f11fadab5baf78
|
2021-04-22 23:28:30 +00:00 |
|
Tianjie Xu
|
676422f239
|
Merge changes I296c1011,I05695607 am: 58deb1cfc1 am: c9674eec21
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682127
Change-Id: I8328f17b833c9b5673e5fab258be39e59e159c5f
|
2021-04-22 23:12:14 +00:00 |
|
Tianjie Xu
|
c9674eec21
|
Merge changes I296c1011,I05695607 am: 58deb1cfc1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682127
Change-Id: I7f7c45e39cb918a94d0c469dedfab4d06491ec38
|
2021-04-22 22:51:01 +00:00 |
|
Tianjie Xu
|
58deb1cfc1
|
Merge changes I296c1011,I05695607
* changes:
Add RecoverySystemServiceTest to presubmit
Check the return value of RoR preparation/clear
|
2021-04-22 22:24:46 +00:00 |
|
James Lin
|
6e1bf17f30
|
Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c am: 46d67749d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035
Change-Id: I368a1289fa670a885eeec0aa67760d7c6f52e083
|
2021-04-22 21:23:54 +00:00 |
|
Treehugger Robot
|
3ca99603e3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours am: 655c3483dd -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684930
Change-Id: I63aad3dfab7083c8a084e244ce2ce2a17546b4fe
|
2021-04-22 21:23:36 +00:00 |
|
Treehugger Robot
|
7a9d7c3b12
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684936
Change-Id: I61a9bbc24b3e8cee87610ea6f74604c0347f0aa6
|
2021-04-22 21:23:24 +00:00 |
|
Treehugger Robot
|
552d78d352
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours am: 619e3f9aac -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684937
Change-Id: Ibb87884da80c200c489323a6acfe461aa798e389
|
2021-04-22 21:23:10 +00:00 |
|
Treehugger Robot
|
05957b7ac0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours am: ca61a9bcca -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684939
Change-Id: Id5b83e9b7fc27ec4ffdd9466918d67e08a21dedf
|
2021-04-22 21:22:52 +00:00 |
|
James Lin
|
46d67749d5
|
Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684035
Change-Id: I905a28e7a168a5854ff279078727da27305d8b01
|
2021-04-22 21:17:29 +00:00 |
|
Treehugger Robot
|
655c3483dd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684930
Change-Id: I681625098abbf7f198054efea311c3dadad3e797
|
2021-04-22 21:12:20 +00:00 |
|
Treehugger Robot
|
446ade3135
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684936
Change-Id: Ie22a71a022db330e33583c49e8267d3a7aaa45c8
|
2021-04-22 21:04:23 +00:00 |
|
Treehugger Robot
|
619e3f9aac
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6670c24067 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684937
Change-Id: I730c727c606b6876b367bdb8ca347a0e5472f0d9
|
2021-04-22 20:56:36 +00:00 |
|
Treehugger Robot
|
ca61a9bcca
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: db44950d25 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684939
Change-Id: Ie6ee552173ddba4ea52f4d32ca2c9348c9661b44
|
2021-04-22 20:51:03 +00:00 |
|
Treehugger Robot
|
da19a9eeec
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours am: f6374c6bec -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653
Change-Id: Ia2266cdb0891bde13a8b2cc9751f157bfd0d7232
|
2021-04-22 20:42:25 +00:00 |
|
Treehugger Robot
|
f6374c6bec
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 679c657122 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684653
Change-Id: I2ce940a7276b2ed8469a54786891005d601607e2
|
2021-04-22 20:29:45 +00:00 |
|
James Lin
|
86cb5eeb1c
|
Merge "Remove unnecessary UCE APIs because some of UCE APIs change."
|
2021-04-22 20:25:39 +00:00 |
|
Treehugger Robot
|
843c4eecc3
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684418
Change-Id: I0e38349750ff4882412782fe3838ab1ffe5f7dad
|
2021-04-22 20:23:33 +00:00 |
|
Treehugger Robot
|
40b26445f4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am: d6a61eed90 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684938
Change-Id: Ifddfddc2607ab5cae8e1d5554bddd2d22cdc7251
|
2021-04-22 20:23:24 +00:00 |
|
Treehugger Robot
|
b8322e46bd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours am: d0d8f77e5c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684905
Change-Id: If92c275ed43c726844681d8173d47ff0f864c5f3
|
2021-04-22 20:23:15 +00:00 |
|
Treehugger Robot
|
e18a6f61b1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684410
Change-Id: I08348f0bef425e1dfc89181a752ed2d5f2e30d8d
|
2021-04-22 20:22:59 +00:00 |
|
Treehugger Robot
|
975541d9f0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684418
Change-Id: Ib6d35e5bf97a186da9fb918566b4d26b0f1cac17
|
2021-04-22 20:17:10 +00:00 |
|
Treehugger Robot
|
d6a61eed90
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684938
Change-Id: Iffc7d715b07cc5ec84af713d4de75fc9de71e15c
|
2021-04-22 20:12:07 +00:00 |
|
Treehugger Robot
|
d0d8f77e5c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684905
Change-Id: Iebf66a73b57236bae54223f653d0160e20790aac
|
2021-04-22 20:09:24 +00:00 |
|
Treehugger Robot
|
42bc2d9653
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours am: 0e2edade62 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684928
Change-Id: Ieaec599473c4ef091a76a36df954bda1d8b540a3
|
2021-04-22 20:01:53 +00:00 |
|
Treehugger Robot
|
2bbc0da8b4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours am: a78ee12818 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684412
Change-Id: Id7c733b7e4058e73b068a01330ec2db9a7674efa
|
2021-04-22 20:01:31 +00:00 |
|
Treehugger Robot
|
7cef228686
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours am: ff69663245 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684629
Change-Id: I6bf6a845125d1d3eb9f2cf927f004cd7ed2944c4
|
2021-04-22 20:01:19 +00:00 |
|
Treehugger Robot
|
e908f88308
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684410
Change-Id: I2eb3a67276276504d359ae9051a070cd5c620663
|
2021-04-22 20:01:14 +00:00 |
|
Treehugger Robot
|
0e2edade62
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684928
Change-Id: I91c0650f286ea0cdfdd318f76435ecc059edfe53
|
2021-04-22 19:56:24 +00:00 |
|
Treehugger Robot
|
a78ee12818
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684412
Change-Id: Iabfb45aab57cb25662373e6a26795759abf4f759
|
2021-04-22 19:51:27 +00:00 |
|
Treehugger Robot
|
07587bd2f7
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2021-04-22 19:44:50 +00:00 |
|
Treehugger Robot
|
f975580f62
|
Merge "Import translations. DO NOT MERGE ANYWHERE"
|
2021-04-22 19:39:00 +00:00 |
|
Treehugger Robot
|
a3ccedb3fc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours am: 1689cdd1cb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684929
Change-Id: If7bec524c6ce6e3c0500e1e3750ed5372a28a9fe
|
2021-04-22 19:38:51 +00:00 |
|
Treehugger Robot
|
ff69663245
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684629
Change-Id: Ifdf9131467b08d2c6e2b26c43b9b6e2f4e6b019e
|
2021-04-22 19:38:46 +00:00 |
|
Treehugger Robot
|
0d7dda110f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours am: abed9825c4 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684926
Change-Id: I7e223e27fed7eb8247b351faaf049c2e81d7fbde
|
2021-04-22 19:38:42 +00:00 |
|
Treehugger Robot
|
2426528e62
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours am: b4ffd38e63 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684927
Change-Id: I6f5383e1e74e9a3921ddbaf7663d51afc08d1862
|
2021-04-22 19:38:33 +00:00 |
|
Treehugger Robot
|
235f6a230b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours am: 167d95bed7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684628
Change-Id: I0862eafc027bb50fd23e2298fee01f890a66ea0b
|
2021-04-22 19:38:14 +00:00 |
|
Treehugger Robot
|
1689cdd1cb
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684929
Change-Id: I4cf3d26b3954922bbef445b591bb8732fa7baa83
|
2021-04-22 19:35:33 +00:00 |
|
Treehugger Robot
|
abed9825c4
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684926
Change-Id: I25b8e4a3383a2baf7ffd7b182a3a6cddd9b08f1c
|
2021-04-22 19:34:29 +00:00 |
|
Treehugger Robot
|
b4ffd38e63
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684927
Change-Id: Idfc126c48f20b75ba1601054810a35eca8f5e98f
|
2021-04-22 19:30:13 +00:00 |
|
Benedict Wong
|
7b894e329f
|
Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37 am: 2527e8e270
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675749
Change-Id: Ifc0d61734ef46bd488b51b55c7697c1db08d62c3
|
2021-04-22 19:29:04 +00:00 |
|