tree b86f5949b761d84d4a40ece5c28c5f1fbc1bdb54
parent 0d14b65071a767aa0290b9ec2066ea8b3d0d7edc
parent c6606a413667cd83f2de9d3401f6149eacad6e1e
author Mathieu Chartier <mathieuc@google.com> 1448994262 +0000
committer android-build-merger <android-build-merger@google.com> 1448994262 +0000

Merge "Support null error_msg for select MemMap functions" am: f4c5393952
am: c6606a4136

* commit 'c6606a413667cd83f2de9d3401f6149eacad6e1e':
  Support null error_msg for select MemMap functions