Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d68d2595 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan Committed by Automerger Merge Worker
Browse files

Merge "The unit of memory.soft_limit_in_bytes(memcg v1) or memory.low(memcg...

Merge "The unit of memory.soft_limit_in_bytes(memcg v1) or memory.low(memcg v2) should be 'M', 'MB' is the invalid argument." into main am: 9c0613f3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3534699



Change-Id: Icf002a1eb4040b432920aeb901b2d6aa81ccc74e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9824ca1b 9c0613f3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@
          "Params":
          {
            "Name": "MemSoftLimit",
            "Value": "16MB"
            "Value": "16M"
          }
        },
        {
@@ -619,7 +619,7 @@
          "Params":
          {
            "Name": "MemSoftLimit",
            "Value": "512MB"
            "Value": "512M"
          }
        },
        {