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

Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into... 

Merge "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" into oc-mr1-dev-plus-aosp
am: 54bfe3ac  -s ours

Change-Id: I75c61202b938d1cdf61755877d1ecbfb9191ddea
parents d8a053cd 54bfe3ac
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