OSDN Git Service

am 71d722ac: (-s ours) am 9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
authorElliott Hughes <enh@google.com>
Thu, 27 Aug 2015 11:17:16 +0000 (11:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:17:16 +0000 (11:17 +0000)
commit4e6eddbd79a8f3a104ae3dc79b6456228fd6364c
treea4db20500e7130fd7856f1fff2d10d10c5234160
parentb2cc05397a453405d5ce4f28b5b1037dd2ca9909
parent71d722acbbd99160016840bc60182f253aac648b
am 71d722ac: (-s ours) am 9c6eab9a: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."

* commit '71d722acbbd99160016840bc60182f253aac648b':