tree ef61a9b0dee1d4ae8c0f6b69a180476205799d19
parent 79174b75285e4ece7b7f736fb1b6091f35b98d95
parent 2cf1cf098513807ffd3420ae106f438e943d0cd8
author satok <satok@google.com> 1319178927 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1319178927 -0700

am 2cf1cf09: Fix possible NPE

* commit '2cf1cf098513807ffd3420ae106f438e943d0cd8':
  Fix possible NPE