tree 9ea86adf4b5f09195f56560b94f9a27db20339e7
parent 72df97053c43b9d5e7b9020368bc19fcef0edb9f
parent 88606248535cf43e04e08cbf9bedaa729d0894f5
author Jeff Sharkey <jsharkey@android.com> 1507758110 +0000
committer android-build-merger <android-build-merger@google.com> 1507758110 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 04b96d76a9 am: d20cad62ee am: e62d479921  -s ours am: e9d2113af7
am: 8860624853

Change-Id: Iea7736cd9e60673296bd39377393fa785bd58b17