tree 40c893d3283add4df105b512a49e00bbc73251d6
parent 5600b752a76662a3fe7bbe90003709fddc074ce5
parent 33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8
author Winson Chung <winsonc@google.com> 1336553731 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336553731 -0700

am 33a0ad56: Fixing NPE. (Bug 6460298)

* commit '33a0ad56c0970b5c60b6e4e207f24dcefd1fd3e8':
  Fixing NPE. (Bug 6460298)