tree b86f5949b761d84d4a40ece5c28c5f1fbc1bdb54
parent 226e3a35611c033b9703802adcf54d04fdb96946
parent f4c539395244ccfc14aebaf53fdc1122287f65a6
author Mathieu Chartier <mathieuc@google.com> 1448994020 +0000
committer android-build-merger <android-build-merger@google.com> 1448994020 +0000

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

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