commit | e3482c2601fd025002377d47389be97bbc0c892d | [log] [tgz] |
---|---|---|
author | Brad Ebinger <breadley@google.com> | Wed Feb 01 19:46:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Feb 01 19:46:55 2017 +0000 |
tree | 58632ec5675587c8fe411e0475e8594fa633c36c | |
parent | 7985f418714bffdde43e04211130835b050f06bf [diff] | |
parent | 3aaf673c60377fdff72fe1ab17099083f5fe9622 [diff] |
Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d am: 6734275c2f am: fa1dca0ad6 am: 3aaf673c60 Change-Id: I6a6a2d136f0f31bbac984e4ba18f9f6b90808705