tree b7b6e45fd400e1e4796df2637ceb5ebd3d2dfac7
parent 9576ce66966c843d7d59ed27fbcbf6e64271e2b5
parent 6734275c2f7bdffca50062c08c07a58609eba78b
author Brad Ebinger <breadley@google.com> 1485977756 +0000
committer android-build-merger <android-build-merger@google.com> 1485977756 +0000

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

Change-Id: I6d502db3362aafcfed426b6598be0bd39dd38890