tree fe92919d31a5e444fd280699fe3ad0005eb0270f
parent e553d6405de3b088d49d55222647c6e67495fe4f
author Craig Mautner <cmautner@google.com> 1405443093 -0700
committer The Android Automerger <android-build@google.com> 1405445508 -0700

Add null check

Fixes bug 15847145.

Change-Id: Ia4d223da578bc38516824dd82dd3c5b8d58328dd