tree ab2ed1ac73b5c7cbe56574d87e7b072293501d07
parent 0998a81f5a36bdf19321c5e03ae0722b9691840d
parent 663150a70857430fe9c6ab6db039e8e541bff702
author goneil <goneil@google.com> 1514411203 +0000
committer android-build-merger <android-build-merger@google.com> 1514411203 +0000

Merge "Require that caller holds  SEND_SMS and  MODIFY_PHONES_STATE permissions" am: ee48176ad6 am: f220cdfca4
am: 663150a708  -s ours

Change-Id: I6afc251ec22979c349f5255a9c6b297e008818ea