| commit | 5ec940aed81b35b497c65b27a98d2ddf595cb525 | [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 | bb9c0a00316bfb55fb4d690022143e347f06c0ee [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.