Skip to content
Commit 8e9fb175 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. am: 1f2a5d36 ... 

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: 1f2a5d36  -s ours am: b52056d5 am: 563ea682 am: 901c587c am: 1455bd64  -s ours am: 7f00f14d am: 3c30346d am: b049f43f am: 1b40397e am: 00183554  -s ours am: 61d6dd81 am: 438ed436 am: d59cb81e" into oc-mr1-dev-plus-aosp
am: c10c5725  -s ours

Change-Id: I19c8ea20b8a32b4cac1a6ccf70ed56b22c7cb083
parents d81a48c7 c10c5725
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