| commit | 308ae73778169b595fa0c62d91c610fa581135b3 | [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 | 706ae7b0c2538f6ccbacd6ea11504278293ea02e [diff] | |
| parent | 6a65e8f74758a088cdc6f0bf91fb7567a25435d6 [diff] |
am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit 'e6e71608bd60b4745b048ec466b5ea1301020b32': Use __ANDROID__ instead of HAVE_ANDROID_OS.