| commit | c80b5ffbf2d7b5cdc312903128d8a03e58825de7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 31 18:07:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 18:07:32 2015 +0000 |
| tree | 98e65742680e435de6c3204ca40564d8325ae130 | |
| parent | 4861686782b5ed228f1062b561741b8f652ca03d [diff] | |
| parent | e2f791031746c0c2d84c2abc176846f3574c866c [diff] |
am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit 'e2f791031746c0c2d84c2abc176846f3574c866c': Use __ANDROID__ instead of HAVE_ANDROID_OS.