am 672a5be2: am 64f6b529: Merge "Avoid NullPointerException"
authorJeff Sharkey <jsharkey@android.com>
Thu, 2 May 2013 17:56:09 +0000 (10:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 2 May 2013 17:56:09 +0000 (10:56 -0700)
commit5fbee1e7259f99fa999cad0e69c4c75666f3de5f
treef03497df9fc4464cb7607d2ae2a405ba234a37d8
parent7db903f443405b6a0c0da48b54942426d8ed92b8
parent672a5be2fb115a4480d6867c06b9da2a36d5353c
am 672a5be2: am 64f6b529: Merge "Avoid NullPointerException"

* commit '672a5be2fb115a4480d6867c06b9da2a36d5353c':
  Avoid NullPointerException