| commit | c6ada3b169827f581cd61749c6056c4209ebb650 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 23:21:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 23:21:58 2015 +0000 |
| tree | 508acc37b5d241c99acdf9c30e8b98937018ae28 | |
| parent | 18343a2fd11583b884d1566a232a75b004fb3813 [diff] | |
| parent | 6a846dd51885df861f4e1e30fcca86b9dd2f4092 [diff] |
am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." * commit '6a846dd51885df861f4e1e30fcca86b9dd2f4092': Lose HAVE_ANDROID_OS from frameworks/native.