tree 38dd9e18dc0be122791219b877c38bf15ed08c22
parent 20e6916035865710b7a30ac7f2eac1311e2c2e70
parent f64d4f6e48e78082b338ddda6f77ec1c04951fd6
author Pawin Vongmasa <pawin@google.com> 1499829930 +0000
committer android-build-merger <android-build-merger@google.com> 1499829930 +0000

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

Change-Id: I42122416afc64235cc449070e371ceb7776b43c0