| commit | 68408918c27987204b5fbd6be4ea87bbede7663a | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:35:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:35:48 2017 +0000 |
| tree | 1dc867f670223e3fa7291d946e91f1b62f88b1df | |
| parent | f65d16695942ef4024ea10a81f2d1a75ab53d77c [diff] | |
| parent | 4a69ee914c83b0bebe0c3a6d62f4abcb85328b32 [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb am: 4a69ee914c -s ours Change-Id: Id50190ce08ae0d0f1e417db0f7290b3c7ea5c2fe