| commit | 6530612cee5ebdf4c1f38c09699d3ccf46794ed6 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 22:42:20 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 22:42:20 2017 +0000 |
| tree | 4dd87d885012a384d50c5da939167ebb994e1c40 | |
| parent | da968fb57fa7e387e47139d8b979d630e51777c2 [diff] | |
| parent | 6ef8866b04ca8e63ef5861437354e5047d81f1bd [diff] |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c am: da3d10591a am: 97f6a0da40 -s ours am: 3b47256ccf am: a7f0504849" into oc-dr1-dev-plus-aosp am: 6ef8866b04 Change-Id: Ic989ee531576564282dbc4ab065f4dd6b99a6c4c