| commit | e0e1c8ae4c81e54e2294c76975bde45fcfe89274 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:03:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:03:59 2017 +0000 |
| tree | 284300db6f377b6b378976fbdd2fc9931b24fe8b | |
| parent | 4e733f30748fe9834bea02ae4ccbef662bc6f6f8 [diff] | |
| parent | 98371ee7c9b5175cad2e0b7060cc5983bcb828d7 [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 Change-Id: Ib74482b52dcd5e3ac21b4b61e6a56f3293cddbd5