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

* commit 'c2e47ba1ef9d097e92a3be2cc5a8655656d19dd1':
  Fix NPE in CallDetailActivity