tree 96230c6359abc306e893d93e79c792d36042c6ca
parent aea873ade0832d3f248f7416d0caa04662134cc7
parent 390ec27f9dfe1b0714e1a01f6553867f7d4c1c45
author Brad Ebinger <breadley@google.com> 1485977441 +0000
committer android-build-merger <android-build-merger@google.com> 1485977441 +0000

Merge "Adds @hide permission granting API for ImsServices"
am: 390ec27f9d

Change-Id: I0f3d38811925884681d11cf18e12f1b0574d64c6