tree 62689757cdc2670c37d95f113af5b5d00c577cd3
parent 91f0c696daf8f894c4bd568218cab5c9b29426d6
parent cab962b8d0684c31dca44808d095978f6d04f8e8
author Android Build Merger (Role) <android-build-merger@google.com> 1502905680 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502905680 +0000

Merge "Merge "Allow explicit permission denial" into oc-mr1-dev am: 7fc53a11f8" into oc-mr1-dev-plus-aosp