tree a4d4aec689cd583a40b75c33da257a2891e5ea17
parent fd330693c815b8c88003144ff1d170aacc5c01e4
parent 2503ca0e980e8bdab95291840b37f80137c1a585
author Andrew Sapperstein <asapperstein@google.com> 1414957974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414957974 +0000

am 2503ca0e: am 769ad2a9: am 2585ad6c: am 8c601e4f: Prevent NPE. Fixes b/17639380.

* commit '2503ca0e980e8bdab95291840b37f80137c1a585':
  Prevent NPE. Fixes b/17639380.