Commit 5232d6d9 authored by Steven Moreland's avatar Steven Moreland
Browse files

Revert "resolve merge conflicts of 03e80b46 to oc-dev-plus-aosp" 

This reverts commit 40d89431.

Reason for revert: didn't delete mk

Change-Id: Ib3a3f249c278be582de04a583e18de3c0e502d5e
parent 40d89431
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