tree 65c680dccf0f456a39ca36a2777a00c543ed6327
parent ed0f8f425d90254590bf49e2b6e2fe77be679701
parent f851e5a9f968c519f659bf85e3bd7127dc2a2885
author TreeHugger Robot <treehugger-gerrit@google.com> 1499829159 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499829159 +0000

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