tree 09de973bab58d89348324bc053632df86301a817
parent 43712e248cd90c97edb989f2053e56d9362e9f8d
parent 101fca656d56896a9c53c12ca4c9c150444e111e
author Jeff Sharkey <jsharkey@google.com> 1501344242 +0000
committer android-build-merger <android-build-merger@google.com> 1501344242 +0000

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

Change-Id: Ifa868b17837796dec93c93119260a92f4241f624