OSDN Git Service

Merge "Add nullptr check" into oc-mr1-dev
authorJohn Reck <jreck@google.com>
Wed, 27 Sep 2017 19:50:07 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Sep 2017 19:50:07 +0000 (19:50 +0000)
am: b20694ab00

Change-Id: I090a1d0a4f0b2b5ec8c599d795995ea242c2a6ca


Trivial merge