tree 03052bcc60ac2f67852476f04ea3cba83c9798e2
parent a9e57d346aff42ccb4dc1016510ec9245a7550a3
parent 636495c14df7699413637be9c82fbafc4db725fe
author Steven Moreland <smoreland@google.com> 1495475588 +0000
committer android-build-merger <android-build-merger@google.com> 1495475588 +0000

Merge "Allow clients of mapMemory to recover." am: 079afdf499
am: 636495c14d

Change-Id: Ib2a4fac1e25bc8ecf16c54571bf62a34058b3d9e