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