tree 14fb7c4ec51984506b4e4c73c24aee66d9efa522
parent 132ad3291b833ecaca425ef0e4b4ff9360ccd42b
parent 69a10949d62255f6b32dff8c3a6a91cbfcf98587
author Adam Cohen <adamcohen@google.com> 1392410325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392410325 +0000

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

* commit '69a10949d62255f6b32dff8c3a6a91cbfcf98587':
  Fix NPE from feedback (issue 12106858)