tree 656d3316792ee40ffec0069be56c9b9db221f0f0
parent 74b32989949956d099575d844903e8ee0d14c2c0
parent 901c587c6b53776a967b9ee71e23232dcc6488ba
author Jeff Sharkey <jsharkey@android.com> 1508454376 +0000
committer android-build-merger <android-build-merger@google.com> 1508454376 +0000

DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d3622  -s ours am: b52056d549 am: 563ea682e7
am: 901c587c6b

Change-Id: I3e721dc6183024b73b70d1f30363983a7afaf6d1