tree 09699c22a4fa12c5aa2660abcd6d1de95fbff1bd
parent 5de33657cb16f5ad58fc41d00c4fd2a7ddf59718
parent 69a10949d62255f6b32dff8c3a6a91cbfcf98587
author Adam Cohen <adamcohen@google.com> 1386894368 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386894368 -0800

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

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