Commit c6ada3b1 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." 

* commit '6a846dd5':
  Lose HAVE_ANDROID_OS from frameworks/native.
parents 18343a2f 6a846dd5
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