Skip to content
Snippets Groups Projects
Commit a66d8d23 authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

am 460c3f16: resolved conflicts in merge of 3fa92bed to lmp-mr1-dev-plus-aosp 

* commit '460c3f16':
  Accept command-line input for neverallow-check.
parents 8c041147 460c3f16
Branches
Tags
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment