commit | 5f17a285f9b64dfb04f786b23902cab2a2bbd1a5 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 20:30:25 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 20:30:25 2017 +0000 |
tree | 18d74257ed8caa2a76f26d32e0b5ceacc7984b5c | |
parent | e721fbddb51f4786d76072e56cf5a71a48584458 [diff] | |
parent | 09984216e6ac885f1d5cff8d67ae152bd825de6c [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours Change-Id: I3dcf7d6fdf11a8ed82d6f2362a18b12afaff1120