OSDN Git Service

am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID...
authorBen Cheng <bccheng@google.com>
Thu, 12 Dec 2013 22:03:40 +0000 (22:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 Dec 2013 22:03:40 +0000 (22:03 +0000)
* commit '74f27cffd9bbbd0f791e1f0f0096f706c91ad08f':
  Add an explicit definition of __ANDROID__=1


Trivial merge