OSDN Git Service

am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"
authorAndreas Gampe <agampe@google.com>
Thu, 30 Jul 2015 16:59:56 +0000 (16:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 Jul 2015 16:59:56 +0000 (16:59 +0000)
commit053c1d86251600af04d29dcb1727631a6847dbf3
tree407b4dcad02f0ee628791e03ad3ee5b53ebb669a
parent527860a2c82b0eb29fc0e5e3f560740d044c3b20
parent430dd633e3334c6d684c17218435a881ef4510c4
am 430dd633: am 5d2ed003: Merge "ART: Use __ANDROID__ instead of HAVE_ANDROID_OS"

* commit '430dd633e3334c6d684c17218435a881ef4510c4':
  ART: Use __ANDROID__ instead of HAVE_ANDROID_OS