am 672a5be2: am 64f6b529: Merge "Avoid NullPointerException"
Jeff Sharkey [Thu, 2 May 2013 17:56:09 +0000 (10:56 -0700)]
* commit '672a5be2fb115a4480d6867c06b9da2a36d5353c':
  Avoid NullPointerException


Trivial merge