tree 320d0a86627607e8046d02ec81a678d1b8157f8a
parent 42fafc28f49be65c2476e13ea45f816f3f09dbb1
parent 4002465f5824b7f1b8bdf9927c71b2585ad2bdde
author Adam Cohen <adamcohen@google.com> 1392411219 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411219 +0000

am 4002465f: am 7be5f565: am ab087b9f: Fix NPE we\'re seeing in feedback (issue 11626428)

* commit '4002465f5824b7f1b8bdf9927c71b2585ad2bdde':
  Fix NPE we're seeing in feedback (issue 11626428)