tree bfac3bb3795231f33601e28e19b17e47507431f7
parent 23c11e2c460eaabf9f9fb482dde46a2872c74819
parent 609693ab4c3ab7475d0993c4a219868a81f6eed1
author Yorke Lee <yorkelee@google.com> 1431722116 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431722116 +0000

am 609693ab: am a319842d: am 4c9a8cf0: Merge "Fix potential Dialer NPEs" into mnc-dev

* commit '609693ab4c3ab7475d0993c4a219868a81f6eed1':
  Fix potential Dialer NPEs