tree 6c356a1383abbc33fb86084b67aed6efe069fe96
parent 6d6d685fd8e7ace3d5d5f79aee86f192759a030c
parent e380dbeb0242a93e3fd6014fc53ea97f6a09daab
author Paul Stewart <pstew@google.com> 1458363785 +0000
committer android-build-merger <android-build-merger@google.com> 1458363785 +0000

Guard against return value already being null am: 9c42c0b
am: e380dbe

* commit 'e380dbeb0242a93e3fd6014fc53ea97f6a09daab':
  Guard against return value already being null