| commit | f27bd491167418fb3efbab5ee7beae9080bf8fd0 | [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 | 7570611af5b2da9373a45a6f4723bfa879bda945 [diff] | |
| parent | 308ae73778169b595fa0c62d91c610fa581135b3 [diff] |
am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." * commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f': Use __ANDROID__ instead of HAVE_ANDROID_OS.