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