commit | c4649e252dca4dc234ccd5087f5a41865b96d7d0 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:48:19 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:48:19 2017 +0000 |
tree | 3d24677b9c7aadc33206f0a11e18831715aab168 | |
parent | b49d3579150051a33b858422abe961dbd8377486 [diff] | |
parent | 8bfef31ce0413bd1adfa30b5a5f7ce040747340d [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 am: 8bfef31ce0 Change-Id: I79106ed066b76f9597d74e56498fa3a9c6258f7f