| commit | a04a837f95346db359b66f2a503a9c05e9303af2 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 21:59:03 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 21:59:03 2017 +0000 |
| tree | c901d5ac3407bcc98b36b3e9a26e9eb531cd0150 | |
| parent | fd77afd548753d8f9e1546ae30788fc86529cdbd [diff] | |
| parent | 2771394e89848b397b10f3ad00064f009a53a876 [diff] |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr1-dev am: 9d3706046c am: b4d23d55c2 am: e1ae848970 -s ours am: 7f108b81b3 am: 4a71a2daf6 am: 0de1d85a01" into oc-mr1-dev-plus-aosp