tree 3d943baaa923b638ce3599205f8e1850ec7cdf45
parent 344129d3c949bf5cb9b2151acc355a3d3c437d53
parent f39a9b0ed9856cf0ee1c9e3d11b61bcb428909ca
author Paul Stewart <pstew@google.com> 1458364560 +0000
committer android-build-merger <android-build-merger@google.com> 1458364560 +0000

Guard against return value already being null am: 9c42c0b am: e380dbe am: a013472 am: 9744b79 am: 62c35f6
am: f39a9b0

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