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

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

Change-Id: I3c81e5f426d6f4e41914b5f35803dd35ccc47710