tree edd1087753065681b11e6c54b90885211712a4cd
parent 31dcf0154d4ba4650915987b666a6cea0048339d
parent b9bacc624e016d60416fe28b7dcb1b081a76cf73
author Pawin Vongmasa <pawin@google.com> 1499829542 +0000
committer android-build-merger <android-build-merger@google.com> 1499829542 +0000

Merge "Handle nullptr from mapMemory properly" into oc-dr1-dev
am: b9bacc624e

Change-Id: I25c5959c7a295eb1c46d688aa8f52f2f2195c1ad