tree 508acc37b5d241c99acdf9c30e8b98937018ae28
parent 18343a2fd11583b884d1566a232a75b004fb3813
parent 6a846dd51885df861f4e1e30fcca86b9dd2f4092
author Elliott Hughes <enh@google.com> 1439421718 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439421718 +0000

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

* commit '6a846dd51885df861f4e1e30fcca86b9dd2f4092':
  Lose HAVE_ANDROID_OS from frameworks/native.