| commit | 30dddd6f49b04ac5160c1de702cafe09b42ce1d1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 23:28:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 23:28:34 2015 +0000 |
| tree | 926aee8c2f79540dd8de9864b634681df977710e | |
| parent | 9adfbce773ce84ca21ef88664f2b23ac7e32ee45 [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.