tree 3778fbcb62643945273b35dd875f7105009e8745
parent 563ea682e71a80d14a4a9c903001d48edfd72720
parent 08bd3a75fba4101427788296cad98c45316166f5
author Jeff Sharkey <jsharkey@android.com> 1508452333 +0000
committer android-build-merger <android-build-merger@google.com> 1508452333 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: ca7ffa06bc  -s ours am: edb6b17ebc  -s ours
am: 08bd3a75fb

Change-Id: I18e61b7280df672c91bb076f3ed894f895e075a0