commit | 114080588744a7a30e52b90ab77ba2df122bbb4c | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Mon May 22 18:04:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon May 22 18:04:09 2017 +0000 |
tree | a4736731632ccb20907ace5a511fab58ba274094 | |
parent | a8d813df69681c21cbf3370f05f260f0df01de7d [diff] | |
parent | 0d0bd78eea5189a08698480f93c240fd0658b82e [diff] |
Merge "Allow clients of mapMemory to recover." am: 079afdf499 am: 636495c14d am: 771654961d am: 0d0bd78eea Change-Id: I7f6cd0df7fd332713ed1f9d4d2e9a99c0e7acbd3