tree 84f1480cc222b15b4ec9208e0bad863187bb5d12
parent 94eb33a365c14f7adfc493455c91adaa093b5b35
parent d56b01e022d88bc62a97dd8e3420b65feb266089
author Jeff Sharkey <jsharkey@google.com> 1501344843 +0000
committer android-build-merger <android-build-merger@google.com> 1501344843 +0000

Merge "Add a missing null check" into oc-dev am: 101fca656d
am: d56b01e022

Change-Id: I48191b693fac40513b670c711afea568eafe1ebf