tree c180cc90803630dc19c65072c9fafcdc64dee336
parent 7049137d7f5e445c5be300008bc5f43346084c2f
parent df8569787ce3278035b0b2e7204cd1b72924a801
author Todd Kennedy <toddke@google.com> 1498497014 +0000
committer android-build-merger <android-build-merger@google.com> 1498497014 +0000

Merge "null check before dereference" into oc-dev
am: df8569787c

Change-Id: I62067d87f75367bb527862d3ac3873b3c94c9b7c