| commit | 1bb39cbd70d861ed0aca5315be9a4c85df627b40 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Sat Aug 01 15:48:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 15:48:01 2015 +0000 |
| tree | 98e65742680e435de6c3204ca40564d8325ae130 | |
| parent | 964f488637ef805cdd5ff19203e56ffa39a6e25b [diff] | |
| parent | e2f791031746c0c2d84c2abc176846f3574c866c [diff] |
am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit 'e2f791031746c0c2d84c2abc176846f3574c866c': Use __ANDROID__ instead of HAVE_ANDROID_OS.