| commit | 145afc2cc4f973a4ad63aeabe5b0f633c8e99cec | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:50:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 16:50:15 2015 +0000 |
| tree | 43391eef0509bc8627b09a5b11326ff3c043fac1 | |
| parent | c6dbc85845e58464541bb0644ebd570c44841a4c [diff] | |
| parent | fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f [diff] |
am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f': Use __ANDROID__ instead of HAVE_ANDROID_OS.