| commit | 289b4d8c5399c0db2dda1fbde5c95db7e1e9bffd | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 22:06:40 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 22:06:40 2017 +0000 |
| tree | c901d5ac3407bcc98b36b3e9a26e9eb531cd0150 | |
| parent | a04a837f95346db359b66f2a503a9c05e9303af2 [diff] | |
| parent | e3e396ac410348c7aa6e5e8bf4c38b64c0c5fc9c [diff] |
Merge "Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev am: 383ab095f5" into oc-mr1-dev-plus-aosp