Commit 869299a5 authored by Brian Carlstrom's avatar Brian Carlstrom Committed by Android Git Automerger
Browse files

am 7c256ead: resolved conflicts for merge of 50e7d733 to klp-modular-dev-plus-aosp 

* commit '7c256ead':
  Update black list for klp-modular-dev
parents aea2ef7f 7c256ead
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment