commit | 383ab095f5793a7ed9c3151ecbaddeb869e8abc2 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Wed Oct 11 21:26:04 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 11 21:26:04 2017 +0000 |
tree | fbb49e11ea3f27b0689d4715be7480efe5cfe972 | |
parent | b9629cd4324446201d12db86b2a00ffce23bbe0e [diff] | |
parent | 69e02608d56437ed5b6797a9f7a558aa8ac47ff7 [diff] |
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev