Merge "Internalize subclasses of Memory"
am: 5fb660930c

Change-Id: I1fc6df9d1c6a195e78e62a6361ad1c9df0e28a8c
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: 7ad4c6b7f80266e6bfcceac211aa35c9e9761bb7
8 files changed