tree f6e1e639b8db18013ea36822aaa63bc93bca06df
parent 0a5abe58345404b1277eade547a54d67f8800190
parent 22580b83f18b572707ea47f99cb9016f067b89f8
author Jason Sams <jsams@google.com> 1427409304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427409304 +0000

am 22580b83: Merge "Fix potential npe"

* commit '22580b83f18b572707ea47f99cb9016f067b89f8':
  Fix potential npe