Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1988 commits 1 branch 0 tags 63 MiB
Commit graph

1988 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephane Lee
35cc68aa22 Add device-specific support for GoogleBattery AIDL V1 
Bug: 232461104
Test: Ensure Adaptive Charging/Battery health flags works as expected
Change-Id: I8266f622641ca42672685ce3869f03b433cadbe6
 2022-06-08 18:10:40 +00:00
Kean Mariotti
0c2e0a54d1 Revert "init: fix incorrect pca94xx sysfs node path" am: 41329324a4 am: 3905b03c49 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18796207

Change-Id: I37a62a5ced464d99c8926ddcf8ceceef08429249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 15:49:19 +00:00
Thurston Dang
4da7fdc1a7 Clear secure deletion keys upon factory reset 
This ports the gs101 configuration - which clears the secure
deletion keys upon factory reset - to (REDACTED DEVICE), as
suggested by David Drysdale in b/223934835#comment53. In the
absence of this change, the key slots may eventually get filled
up (e.g., by failing tests) and never be released.

Bug: 223934835
Test: Check logcat that keys are cleared after factory reset
Change-Id: I56efb76cb6bb0cdfe2eb9b0ac3ca89e49bfc57f0
 2022-06-08 15:35:02 +00:00
Kean Mariotti
3905b03c49 Revert "init: fix incorrect pca94xx sysfs node path" am: 41329324a4 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18796207

Change-Id: Ie64995226fc351b7baaf81a79ca48a8c633ed2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 15:17:24 +00:00
Kean Mariotti
41329324a4 Revert "init: fix incorrect pca94xx sysfs node path" 
This reverts commit 0d15498d3e.

Reason for revert: 235332394

Change-Id: I50e46d66f33b1b29917f6827fc9cb51da9fe293a
 2022-06-08 12:51:36 +00:00
Jack Wu
43f80a84b1 init: fix incorrect pca94xx sysfs node path am: 0d15498d3e am: 8b48fa1d7b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18773323

Change-Id: I32b99e084e46a4b2d53fd0d26fe4f111b10da91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 10:32:39 +00:00
Jack Wu
8b48fa1d7b init: fix incorrect pca94xx sysfs node path am: 0d15498d3e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18773323

Change-Id: I2849497245ca182069061e778fe66b3048bad71b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 09:49:19 +00:00
Jack Wu
0d15498d3e init: fix incorrect pca94xx sysfs node path 
Bug: 235050913
Test: can parse pca stats in pixelstats-uevent
Signed-off-by: Jack Wu <wjack@google.com>
Change-Id: I4b921102bd46544adfc049816ba31b3188859973
 2022-06-08 09:24:39 +00:00
Erik Staats
f117cb7bf1 Add head tracker feature. am: cd51a5d5bf am: f354e504dc am: 4bdaa24fe0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I088214fe3f0f445271e8118e8d182279271f481c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 00:21:49 +00:00
Erik Staats
34351aa623 Add head tracker feature. am: cd51a5d5bf am: 894a5ddb92 am: 5da1a96434 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I2fb83629b0c5ce147a9961591f6f5136da459e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-08 00:21:19 +00:00
Erik Staats
4bdaa24fe0 Add head tracker feature. am: cd51a5d5bf am: f354e504dc 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I5fb7f19c7c5d5765ba8a3bb493148525407c1107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 23:51:42 +00:00
Erik Staats
5da1a96434 Add head tracker feature. am: cd51a5d5bf am: 894a5ddb92 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: Ia76bb5a49b3f17c783dc5b45d9abea309b3685d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 23:51:22 +00:00
Erik Staats
f354e504dc Add head tracker feature. am: cd51a5d5bf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I13d75516a07959a98ee4ce06107db92c3037ed08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 23:26:01 +00:00
Erik Staats
894a5ddb92 Add head tracker feature. am: cd51a5d5bf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18783036

Change-Id: I56197043111b5a967ec6033b95f2d7ca4f89cc20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-07 23:25:54 +00:00
Erik Staats
cd51a5d5bf Add head tracker feature. 
Bug: 233082034
Test: Verified that head tracker feature is set and sensor feature CTS
 test passes.
Change-Id: I125284a6264af74d9aebfa8a1cb1e91a8f6a67a1
 2022-06-07 23:00:41 +00:00
Jenny Ho
3f0bd74144 dumpstate: dump AACR related data am: 4617cffdd7 am: c25e2e155e am: adae103a56 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I7544c2aa33b22cd46a3d7f552aa425294d5ee9d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 14:04:29 +00:00
Jenny Ho
16c33bac06 dumpstate: dump AACR related data am: 4617cffdd7 am: 5dc4ae0a52 am: cc1e0b42cc 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I6bb2832582f314be12f8eaaa12799e5051479407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 14:04:21 +00:00
Jenny Ho
adae103a56 dumpstate: dump AACR related data am: 4617cffdd7 am: c25e2e155e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I6cd09b2a049386f1ff3ec91c32a674711524649e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 13:42:08 +00:00
Jenny Ho
cc1e0b42cc dumpstate: dump AACR related data am: 4617cffdd7 am: 5dc4ae0a52 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I9de0fac8d0ed5b2744b59383f2a44e14a4b6bc28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 13:41:52 +00:00
Jenny Ho
c25e2e155e dumpstate: dump AACR related data am: 4617cffdd7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I0a2d44b46f98dbae483d4601fc05fdf1610028c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 13:21:32 +00:00
Jenny Ho
5dc4ae0a52 dumpstate: dump AACR related data am: 4617cffdd7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18673509

Change-Id: I73ab3b64801d01c46f4b3d5af76dfa5729646cc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-06 13:21:30 +00:00
Jenny Ho
4617cffdd7 dumpstate: dump AACR related data 
Add charging table and capacity dump for Age Adjusted Charge Rate (AACR) feature

Bug: 209987670
Signed-off-by: Jenny Ho <hsiufangho@google.com>
Change-Id: Ic9dd435557bf4e941fcbdb48fb134c938dd5be83
 2022-06-06 13:00:09 +00:00
Nate Myren
30dd720a21 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 am: 47d3f62b3d am: 5a374e155d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: Ib6ae00b1c7492a29e1d4c854cb965c29d3183c2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:10:41 +00:00
Nate Myren
38ce193f4d Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 am: 0dc71df57c am: c91ba7e483 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I356a53799ffdb8242c6d9c390d94436bafc766f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:09:49 +00:00
Nate Myren
65b96367c6 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 95b2c16645 am: d438b3e4e6 am: 35326e2b83 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: Ib728499c98c6155e1a0ad29ef4028b745125cdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 22:08:54 +00:00
Nate Myren
5a374e155d Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 am: 47d3f62b3d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: Iab2540b0b8d90ef77bb558ab0fd101c6a0582581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:48:17 +00:00
Nate Myren
c91ba7e483 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 am: 0dc71df57c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I2be56ec82e7125f79a7a4b52865bd26ea1b1ddbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:42:10 +00:00
Nate Myren
35326e2b83 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 95b2c16645 am: d438b3e4e6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: If5aef404f1f885cc6eb80112757ebf413c50bc47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:41:21 +00:00
Nate Myren
47d3f62b3d Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I065309bbe678a6c7323a979700eed5c5c109d75b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:26:21 +00:00
Nate Myren
0dc71df57c Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 8aea924b79 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I6ee135ef82a71c8ce44bba15604e5505f5aa48b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:26:15 +00:00
Nate Myren
c2e03fa69b Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: bccd6fe1c4 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I176d24f1ae51eeafc4acd80b30960881fc907a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:25:41 +00:00
Nate Myren
d438b3e4e6 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e am: 95b2c16645 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I582f6416a759286136b93673099bbeefdd2e86ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:16:34 +00:00
Nate Myren
8aea924b79 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: Id1622daaa82539159d55a7f0731fe1f38ad6a200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:01:37 +00:00
Nate Myren
bccd6fe1c4 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I8f1056a7291a57ac43fb8db8b914391df74badcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 21:01:30 +00:00
Nate Myren
95b2c16645 Add notification pregrant for turbo on g s 2 0 1 am: 1c1776a05e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18697501

Change-Id: I9a4e0c0f69268057d2e2232dc238b3749b5de0ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-02 20:59:54 +00:00
Nate Myren
1c1776a05e Add notification pregrant for turbo on g s 2 0 1 
Bug: 233903326
Test: manual
Change-Id: I0c87136f4370c8da8b1f9449fb81faab46e23a30
 2022-06-02 20:38:13 +00:00
Automerger Merge Worker
af89b1bdb7 Merge "[automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f am: c54ab7935b -s ours" into tm-d1-dev-plus-aosp am: 19cb2be950 -s ours am: 6e7c79720f -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 c9fe11999f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: Ie38421ab542748080efcda8301ea8deed59358d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:32:39 +00:00
Jeremy DeHaan
5307b4b14e [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours am: 2a83f01a7c -s ours am: 19f9283e73 -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I5897f5bfd602326965adce492fb6243221deecb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:32:07 +00:00
Jeremy DeHaan
c85e2d21f3 [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours am: 8b65fe6f2e -s ours am: 2535965baa -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: If25da81f57d38a9d15ab9a893befbe1b0aeb28e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:31:26 +00:00
Automerger Merge Worker
6e7c79720f Merge "[automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f am: c54ab7935b -s ours" into tm-d1-dev-plus-aosp am: 19cb2be950 -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 c9fe11999f is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I76dc37cccdf18035e1cc9b8069d86b0c8296af94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:09:26 +00:00
Jeremy DeHaan
19f9283e73 [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours am: 2a83f01a7c -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I826a3364f5a265b2adeef59c819b20cf8b3c2926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:08:43 +00:00
Jeremy DeHaan
2535965baa [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours am: 8b65fe6f2e -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: Idb7664d52bab10bd5c8d3c2c62ab552dda3a6eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 22:08:22 +00:00
Automerger Merge Worker
19cb2be950 Merge "[automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f am: c54ab7935b -s ours" into tm-d1-dev-plus-aosp 2022-06-01 21:52:51 +00:00
Jeremy DeHaan
79e789ae11 [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f am: c54ab7935b -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: Icbbc23f803eef3a707b12d863dcce3a0509b4c0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:52:40 +00:00
Jeremy DeHaan
2a83f01a7c [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I0c4cfa0233aae69d697e7d4f3cc916db31aba569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:52:24 +00:00
Jeremy DeHaan
8b65fe6f2e [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours am: 01f0fbece4 -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I05c98e56f3be2dd601278d72055c590cedc12f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:52:23 +00:00
Jeremy DeHaan
71b0f4e3ab [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f am: 19bf5da1cf -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I261d73a96cb31fd3b75c86c87a48580c3f645bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:51:58 +00:00
Jeremy DeHaan
19bf5da1cf gs201: Update IDisplay to V6 am: c9fe11999f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I78abd74d7e96ffa7fd13311255858bd7ff011933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:36:43 +00:00
Jeremy DeHaan
01f0fbece4 [automerger skipped] gs201: Update IDisplay to V6 am: c9fe11999f -s ours 
am skip reason: Merged-In I8e98eaa369d40040ec4cfddbe235429442bf3f63 with SHA-1 138bc00972 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I0303de83dac97ce02aeab257dbf1af1bd6807324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:36:37 +00:00
Jeremy DeHaan
c54ab7935b gs201: Update IDisplay to V6 am: c9fe11999f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/18606699

Change-Id: I235ac2242a9a0d50b2da4e8fb1f3fdf805c56057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-01 21:36:19 +00:00