Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746a9... (609a6cf1) · Commits · e / os / android_frameworks_base

Commit 609a6cf1 authored Oct 11, 2017 by Android Build Merger (Role) Committed by Android (Google) Code Review Oct 11, 2017

Browse files

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746...

Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions. am: d87d2746 am: 7555eb50 am: 5d60a49d am: 8916c30c  -s ours am: ba1f2d25 am: 300e6ffa am: f1f2a61f am: 92d80b72 am: d6e3d358  -s ours am: bbcb8e49 am: 753a9ab3 am: f718585b" into oc-mr1-dev-plus-aosp

parents 4c8e31db 74de2791

Hide whitespace changes

Inline Side-by-side

Please register or to comment