tree 3638938e2d918ce28179b26a01583d035e9f4ce0
parent 4de7b0ffb06053183d991705b113fb9fe3c9075b
parent 8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36
author Shishir Agrawal <shishir@google.com> 1438282909 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438282909 +0000

am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev

* commit '8d1d8fdaa40cc2149604c9947a7ccf1a6a494e36':
  Add SMS permissions for Carrier app.