| commit | 3bb9d0ec9c976f4438f9a1e5f6036524cfcde2dd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 23:56:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 23:56:11 2015 +0000 |
| tree | b398285dbd1022f06e5ee016dc3836c817550791 | |
| parent | d2c2b74d18dbf02673986401ae10d866733575f3 [diff] | |
| parent | 30dddd6f49b04ac5160c1de702cafe09b42ce1d1 [diff] |
am 30dddd6f: am 6a846dd5: am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." * commit '30dddd6f49b04ac5160c1de702cafe09b42ce1d1': Lose HAVE_ANDROID_OS from frameworks/native.