OSDN Git Service

am 053c1d86: (-s ours) am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead...
authorAndreas Gampe <agampe@google.com>
Thu, 27 Aug 2015 04:07:43 +0000 (04:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 04:07:43 +0000 (04:07 +0000)
commit33fe24decaf398c6b9087b50c3ada84caa98ce18
tree691f879c01823127858bf4d07d9bd849f6e4d827
parentb3ef262a0e8ecb1efde5407b8ac8f9f0ecf5db2e
parent053c1d86251600af04d29dcb1727631a6847dbf3
am 053c1d86: (-s ours) am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"

* commit '053c1d86251600af04d29dcb1727631a6847dbf3':