| commit | 6a846dd51885df861f4e1e30fcca86b9dd2f4092 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Aug 12 22:38:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 12 22:38:47 2015 +0000 |
| tree | 4b9f98fe510268b64bc82cc473bd0ece91da0d30 | |
| parent | 0e3234b7f11048d8291d5427cc0acfb77ba6b843 [diff] | |
| parent | 5f5a0e0ffd89c98742ddedaf01fa13220a542272 [diff] |
am 5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native." * commit '5f5a0e0ffd89c98742ddedaf01fa13220a542272': Lose HAVE_ANDROID_OS from frameworks/native.