| commit | 430dd633e3334c6d684c17218435a881ef4510c4 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 30 16:52:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 16:52:52 2015 +0000 |
| tree | 2d0b0d40d452b47da6428d65555d53afe4774441 | |
| parent | 5fa76856e271ea6820013a4f6e67324069474e0e [diff] | |
| parent | 5d2ed003020feee437683b84e4ea6b8c6a5753e0 [diff] |
am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS" * commit '5d2ed003020feee437683b84e4ea6b8c6a5753e0': ART: Use __ANDROID__ instead of HAVE_ANDROID_OS