tree a80737472a2596175a7549fd49c8d96de379cbd9
parent 3beb1435e3e7a6dd337c5ec20e9978407ef9e125
parent 71d0183cd9b46877b981673f94fed1f5bf094cca
author Adam Cohen <adamcohen@google.com> 1392411756 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411756 +0000

am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit

* commit '71d0183cd9b46877b981673f94fed1f5bf094cca':
  Fix NPE from feedback (issue 12106858)