commit | 69e02608d56437ed5b6797a9f7a558aa8ac47ff7 | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@android.com> | Wed Oct 11 21:21:51 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 21:21:51 2017 +0000 |
tree | 284300db6f377b6b378976fbdd2fc9931b24fe8b | |
parent | e0e1c8ae4c81e54e2294c76975bde45fcfe89274 [diff] | |
parent | 3f671b31940743c407871d54cd503d3f8a7edc67 [diff] |
Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194 Change-Id: I16c9f75cf0181b834cbfa1a7e716aaced2768c5e