| commit | 053c1d86251600af04d29dcb1727631a6847dbf3 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Thu Jul 30 16:59:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 30 16:59:56 2015 +0000 |
| tree | 407b4dcad02f0ee628791e03ad3ee5b53ebb669a | |
| parent | 527860a2c82b0eb29fc0e5e3f560740d044c3b20 [diff] | |
| parent | 430dd633e3334c6d684c17218435a881ef4510c4 [diff] |
am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS" * commit '430dd633e3334c6d684c17218435a881ef4510c4': ART: Use __ANDROID__ instead of HAVE_ANDROID_OS