tree 5110821d613cda5f3e17fe52d62b947bcd63b4ce
parent 51cc53160db29cdd2a69968a292961c9e2ed2204
parent 7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02
author Adam Cohen <adamcohen@google.com> 1392410266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410266 +0000

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

* commit '7be5f565e9b5a87c02db8c53e249fc4bf8dbbb02':
  Fix NPE we're seeing in feedback (issue 11626428)