Skip to content
Commit b969ac5f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d370604 am: b4d23d55 am: e1ae8489  -s ours am: 7f108b81 am: 4a71a2da
am: e2a1e9f7

Change-Id: I7a72aa1793c5e45434f50c4d810164fbbfd70ef9
parents e3e396ac e2a1e9f7
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment