Skip to content
Commit b2f48af2 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

Revert "resolve merge conflicts of 0cc0d229 to pi-dev-plus-aosp" 

This reverts commit 6fa357a5.

Reason for revert: breaks git_pi-dev-plus-aosp build

Change-Id: I12697f8c329ab224f83856176ba989c37920774f
parent 6fa357a5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment