OSDN Git Service

am 151d3936: am 9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
authorElliott Hughes <enh@google.com>
Sat, 1 Aug 2015 15:57:54 +0000 (15:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Aug 2015 15:57:54 +0000 (15:57 +0000)
commitcded5a6538654238dffd280b77da34cc2b2e6b25
tree005bdad04dc8a0f81e9b1be31c8366c72f32a454
parent45f3a6da2f0d25686612a4dd25f80d56d916f4c5
parent151d3936fc80f0bb3592ddf0f80036098fbb3228
am 151d3936: am 9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."

* commit '151d3936fc80f0bb3592ddf0f80036098fbb3228':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.