am 64f6b529: Merge "Avoid NullPointerException"
authorJeff Sharkey <jsharkey@android.com>
Thu, 2 May 2013 17:53:18 +0000 (10:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 May 2013 17:53:18 +0000 (10:53 -0700)
commit672a5be2fb115a4480d6867c06b9da2a36d5353c
treea090567795ba639a8136859b51aceb6934fb017c
parent16961cf4cab924cf8f445d2957ecce7a5d0726b9
parent64f6b529963d1ec997cff60a79c9d249e5e09040
am 64f6b529: Merge "Avoid NullPointerException"

* commit '64f6b529963d1ec997cff60a79c9d249e5e09040':
  Avoid NullPointerException