| commit | 264c67da938a2da4ca2195ed498de75cd170be4b | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Wed Oct 14 23:41:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 23:41:43 2015 +0000 |
| tree | b676cc16d379478e8afdf21b5e45d0f00b5ec741 | |
| parent | 857c7ba0bd6856a109142cf5f7d23d3afc498eac [diff] | |
| parent | bffce8ce7a4a4c8625d5443093e2c1caaabaf975 [diff] |
am bffce8ce: resolved conflicts for cf426036 to stage-aosp-master * commit 'bffce8ce7a4a4c8625d5443093e2c1caaabaf975': Showing a permission prompt for direct call shortcuts