tree a80737472a2596175a7549fd49c8d96de379cbd9
parent 01e377b0b0439ef5e4975c7c7dd4c8aea99d2dc6
parent 19f7dcd5624536544f53a4e53fc1d62b96fdc11b
author Adam Cohen <adamcohen@google.com> 1392411279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411279 +0000

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

* commit '19f7dcd5624536544f53a4e53fc1d62b96fdc11b':
  Fix NPE from feedback (issue 12106858)