Commit ec77b0b3 authored by Yifan Hong's avatar Yifan Hong
Browse files

resolve merge conflicts of 5ee8e247 to master 

Test: run ./frameworks/hardware/interfaces/update-makefiles.sh
Change-Id: I8b8aaf6dc7c321caa7da60e2c8ffddaa0420595e
parents 3cf4996d 5ee8e247
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