tree cca52a71041a8cf58025a39b66aa39dbc4a7aa1e
parent 41314f62cfac2584df0bfc813f658d34e99b6781
parent 57686525ac2170c3acc26afe4d3ce7d4ca0ed090
author Yorke Lee <yorkelee@google.com> 1434758250 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434758250 +0000

am 57686525: Merge "Fix NPE in PhoneAccountSettingsFragment" into mnc-dev

* commit '57686525ac2170c3acc26afe4d3ce7d4ca0ed090':
  Fix NPE in PhoneAccountSettingsFragment