tree e27991983e497202171e7320f69c576f6b777957
parent 9a8b98d1dbeaa348de9324271601e919b60858dc
parent 265aafcdba82f0c7bf9b24d195f6b52138d08b48
author Yorke Lee <yorkelee@google.com> 1435797360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435797360 +0000

am 265aafcd: Merge "Restore Dialer content after permissions granted" into mnc-dev

* commit '265aafcdba82f0c7bf9b24d195f6b52138d08b48':
  Restore Dialer content after permissions granted