tree 03052bcc60ac2f67852476f04ea3cba83c9798e2
parent 45f22fb9bbf657cf6103704fd8e63fa2d8783a25
parent 079afdf4992db4ed25ca826ff349127373cf0e36
author Steven Moreland <smoreland@google.com> 1495475258 +0000
committer android-build-merger <android-build-merger@google.com> 1495475258 +0000

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

Change-Id: I5c55fc0ce83c34d89a1284a77628973bc984f8d0