| commit | 2be4f7e9d56a52c0fb08d85b214760b950221696 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jul 30 16:50:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 16:50:27 2015 +0000 |
| tree | 681578635560c4ec99e86dea4254d8345850e9a5 | |
| parent | 9b69542897ca6081be010be61085d2b6c330dee9 [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.