tree 6715a18f24eb66031fe6f66b5738b356f091043a
parent c2e7f7d67b1cfbc142645ba049fc407bf956da38
parent 54e420fbeba3dbd9f13382458f8f24db5cceb4ae
author Paul Crowley <paulcrowley@google.com> 1558471839 -0700
committer android-build-merger <android-build-merger@google.com> 1558471839 -0700

[automerger skipped] [automerger] RESTRICT AUTOMERGE: Remove low ram carveout for encryption am: 2984cfdd25 am: 0ace38b571 am: ef1a91670d am: 4733d60c51 skipped: 9e03597391
am: 54e420fbeb -s ours
am skip reason: change_id I6c2fd498d2cd99660ee491a23660edbdb0137ecf with SHA1 8f862dff5c is in history

Change-Id: I2c2cc931d4044633511934659f91c2d3d2d75d3b