Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
691,623 Commits 3 Branches 0 Tags
f97843403bfab818738dfcaa11d9be032de762d6
Commit Graph

691623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
f97843403b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5bb4697dcd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I83649f08302d2a7b1685cd3a484eb2fe38f880be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:19:10 +00:00
TreeHugger Robot
f1fcc724d1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 43eca9e7e5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I16f61770ebaa64a21ce226c608fcc2921c2539d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:18:23 +00:00
Bill Yi
b87cc23d17 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5b1539e47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1b5414e837af0f2cb473fc7b3600237016b60dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:17:54 +00:00
TreeHugger Robot
338c95d300 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 02952b1609 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idff659d2755c7003f822cc10820bbaaeeb841715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:17:25 +00:00
Bill Yi
3332d891cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39c58eb945 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8aee04c2d2e4cfb27bb3335f858fea840e4bfd87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 05:17:12 +00:00
TreeHugger Robot
5bb4697dcd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 05:08:44 +00:00
TreeHugger Robot
4067daa417 Merge changes from topic "presubmit-am-ed7698d9c5f74c86a36cd43a83b9a1a8" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 79664db756
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 05:08:44 +00:00
TreeHugger Robot
43eca9e7e5 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 05:07:00 +00:00
TreeHugger Robot
02952b1609 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 04:59:19 +00:00
TreeHugger Robot
d04edc7a8c Merge changes from topic "presubmit-am-bb75d6f3506a458090c2169c1e656124" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8f497e2450
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-11 04:41:24 +00:00
Chiachang Wang
9df60ac18b Merge "Update the java doc" am: b7e998e235 am: a076a5ee40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057431

Change-Id: I4c5251a838f369c2b8fd7bbe0d36d4cc8a84ada4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 03:40:02 +00:00
Chiachang Wang
a076a5ee40 Merge "Update the java doc" am: b7e998e235 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057431

Change-Id: I2189769065eaef8ee864b72601388836fc85fada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-11 03:22:41 +00:00
Chiachang Wang
b7e998e235 Merge "Update the java doc" 2022-04-11 02:54:46 +00:00
Bill Yi
ed6dc4b627 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 8f497e2450 
Blank merge reason: commit message contains skip directive

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

Change-Id: I81fec426de9822698f9e7d5a773ae29ddc928a1a
 2022-04-10 13:43:32 +00:00
Bill Yi
8f497e2450 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifa77a7a41c285fd28c124c67e5b98bcf2e39951f
 2022-04-10 13:43:19 +00:00
Bill Yi
39c58eb945 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4774901c1f896dc82111eda09c73607da6bc1a0d
 2022-04-10 13:36:02 +00:00
Bill Yi
0aaf5d00cb [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 79664db756 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ie7c46a7ab3ea33dbda532d3479a067d4970252a6
 2022-04-10 12:06:50 +00:00
Bill Yi
79664db756 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I42cd936a994a9316624040db20c7e2bafe6a060e
 2022-04-10 12:06:34 +00:00
Bill Yi
e5b1539e47 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I04807482122e525685cfd73bc4461470e6c8766c
 2022-04-10 11:02:12 +00:00
Bill Yi
e42c779e4f [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bbe0c62d66 -s ours am: 32910d0da9 -s ours 
am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history

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

Change-Id: I0528549ce73ce46a530771400ca207f57e9124c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:55 +00:00
Bill Yi
f1b2e36f35 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours am: f2b5cf274c -s ours 
am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history

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

Change-Id: I848c480a986304ead94f98c46b35c7a9ff0779a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 19:14:29 +00:00
Bill Yi
32910d0da9 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bbe0c62d66 -s ours 
am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history

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

Change-Id: I333f0da2c810a8e85493ef3a30193e19a872e6fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:46 +00:00
Bill Yi
f2b5cf274c [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf87 -s ours 
am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b570 is already in history

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

Change-Id: I2ef00440a4935d88da004b94f50a69a493606358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:31:19 +00:00
Bill Yi
bbe0c62d66 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:24 +00:00
Treehugger Robot
9bacfa1b44 Merge "media: fix ImageReader to handle P010 images" am: 7af43734b1 am: e8b737cbd3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052058

Change-Id: I79c7f7adb8bfb4542946802868df04b8211f35e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 18:05:47 +00:00
Treehugger Robot
e8b737cbd3 Merge "media: fix ImageReader to handle P010 images" am: 7af43734b1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2052058

Change-Id: Ifc61c90c9de8ea2d5c6680d9f9aa917096c862aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 17:41:48 +00:00
Treehugger Robot
7af43734b1 Merge "media: fix ImageReader to handle P010 images" 2022-04-08 17:16:51 +00:00
TreeHugger Robot
61094c2093 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: d4cb37a7d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife2921243023a200dc276921cfcdf1f858161457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:45:51 +00:00
TreeHugger Robot
a01b35a94c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7f501131db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1eb9e2bfbc36d8f78d8c007173237edb87f72d97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:45:08 +00:00
Bill Yi
5472d814a5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fe7a5a9dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id762a5b35f4f779c887601e10deab8782d636b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:45:01 +00:00
TreeHugger Robot
a4c8d4c7f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 70defae493 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e9241f6e165488908432d5225539a9302c4744b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:44:18 +00:00
Bill Yi
b848c88ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c4fe1e592b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5218e5a7d81cf696c6e8b34099dfe741c6a8079f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:44:08 +00:00
TreeHugger Robot
74ad3ffe57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b0298726a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic6a5d35d506df9c5f07de2dbab9c3284d2fdc4a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:43:44 +00:00
TreeHugger Robot
36636806aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fad32ac523 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7bb1f9162b17ba3f9f34e30f364dea7001a16a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:42:39 +00:00
TreeHugger Robot
ad8d18c958 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 4574ba6620 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia2cb6db0063b5e24e6873ae70b258afaae154c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:42:01 +00:00
TreeHugger Robot
74a7fbebe4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: fa189b9d22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3d354ecabaab38ff81b47534b7b301a262108b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:40:49 +00:00
TreeHugger Robot
d7663bfae2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8fea7291bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3bbe73ed83ab15247a9de9ace6a18fe224c4981
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:39:36 +00:00
Bill Yi
76ca451b82 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53ff38ad39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I651fd2e6f5b90a252ad7fdb0cab6000e2a641363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:39:25 +00:00
TreeHugger Robot
f90dfd74fd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6c6c780658 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4b27f6ccae88b162317f88ee2bb88e1cde123022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-08 16:37:56 +00:00
TreeHugger Robot
d4cb37a7d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:24:42 +00:00
TreeHugger Robot
3da216c0d6 Merge changes from topic "presubmit-am-4e05ec46f83e449a869cf30beb6d2744" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 41fa8b5a59
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:24:42 +00:00
TreeHugger Robot
7f501131db Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:24:14 +00:00
TreeHugger Robot
70defae493 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:21:20 +00:00
TreeHugger Robot
b0298726a4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:21:08 +00:00
TreeHugger Robot
4547737198 Merge changes from topic "presubmit-am-9657069f584e4ed1b6ebce8b6d82a21e" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5a60e95f95
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:21:08 +00:00
TreeHugger Robot
fad32ac523 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:20:59 +00:00
TreeHugger Robot
92ef68deb0 Merge changes from topic "presubmit-am-dd66ff18611c4485a6fbaf654c25ab86" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28fa49456c
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:20:59 +00:00
TreeHugger Robot
790bebc79a Merge changes from topic "presubmit-am-0fbcb9f62f004d0f8dc1ef0d89cc3db8" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9fe21f4c91
  Import translations. DO NOT MERGE ANYWHERE
 2022-04-08 16:19:32 +00:00
TreeHugger Robot
4574ba6620 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:19:31 +00:00
TreeHugger Robot
fa189b9d22 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-08 16:18:51 +00:00