[automerger skipped] Merge "rootdir: init.rc to limit discard size to 128MB" into qt-qpr1-dev am: be9114f220
-s ours
am skip reason: Change-Id Iaa8ef6eb862934af43254bd10873a12c3d34e926 with SHA-1 fe9e8a3fa5
is in history
Change-Id: I36721c524982a0b63b5d3d7b3252cf67e8c35fc1
This commit is contained in:
commit
3678cfa412