tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 857c7ba0bd6856a109142cf5f7d23d3afc498eac
parent bffce8ce7a4a4c8625d5443093e2c1caaabaf975
author Winson Chung <winsonc@google.com> 1444866103 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444866103 +0000

am bffce8ce: resolved conflicts for cf426036 to stage-aosp-master

* commit 'bffce8ce7a4a4c8625d5443093e2c1caaabaf975':
  Showing a permission prompt for direct call shortcuts