tree 49ff2e31ed2e6e06d8be3f4d8d2e9cfff38407ed
parent c0b64d45461bcb085727aa666602c786eb919abb
parent cddaa42d58dc6cd97abd0830e59ec4c78cee655b
author Pierre-Laurent Coirier <plcoirier@google.com> 1473754675 +0000
committer android-build-merger <android-build-merger@google.com> 1473754675 +0000

Merge "[DO NOT MERGE] Grant fixed SMS & Phone permission to package handling the twinning settings intent." into cw-f-dev am: 0df86bee98
am: cddaa42d58  -s ours

Change-Id: I74ed12c95cd7f3062dbb2f3375caf8713114618f