| commit | 7bcab85ceb966e647a4143c81230e71ee925fd13 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:55:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 16:55:49 2015 +0000 |
| tree | 124fe4e6458990f10566daf56e89178b2926d580 | |
| parent | 0adada3a813212f9bb710e6a063cf32b82bd6e04 [diff] | |
| parent | 2be4f7e9d56a52c0fb08d85b214760b950221696 [diff] |
am 5ec940ae: am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit '5ec940aed81b35b497c65b27a98d2ddf595cb525': Use __ANDROID__ instead of HAVE_ANDROID_OS.