Commit 5c34e489 authored by Jae Shin's avatar Jae Shin
Browse files

resolve merge conflicts of 8007bdd7 to stage-aosp-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I728cde095a0b722ff64c0f7b0ef1df4b54cf1fbd
parents 29aa7b97 8007bdd7
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