commit | da3d10591aea6d9dc9b90218f8652ec0c5a957a9 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:12:09 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:12:09 2017 +0000 |
tree | a1a5feea7e0c80303316b3f64693123c490fb77b | |
parent | b4d23d55c250023f2f48cf8e413d03845803d759 [diff] | |
parent | 72df97053c43b9d5e7b9020368bc19fcef0edb9f [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-dev am: 254369967a am: 4a60106aa0 am: 72df97053c Change-Id: I62e502ebc6ac642cac7165ce1ce0982675362ab3