tree b1c78dc42563301ebe2b60185a659cecbb1b8702
parent d991dc8bdbce22818d3e1da9245ad277ee9c309d
parent c2e47ba1ef9d097e92a3be2cc5a8655656d19dd1
author Ed Heyl <edheyl@google.com> 1383948162 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383948162 -0800

am c2e47ba1: am d259ee16: am 3d9abc2a: merge in release branch changes (no-op).

* commit 'c2e47ba1ef9d097e92a3be2cc5a8655656d19dd1':
  Fix NPE in CallDetailActivity