tree e27991983e497202171e7320f69c576f6b777957
parent ac330ca173b76e7167ee2dae9bb086c698ef00f4
parent 94291c6f3d2f1bd3381be806e13165734523f117
author Yorke Lee <yorkelee@google.com> 1435798706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435798706 +0000

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

* commit '94291c6f3d2f1bd3381be806e13165734523f117':
  Restore Dialer content after permissions granted