tree eaab9e84c98ac6083253924c942979c84b57a1c3
parent 4d7448291158257d2a74b0fec3c4dd279fb85618
parent 2609640eaea1ba89a493cff2847cb9ec993dc9fc
author Ben Cheng <bccheng@google.com> 1386885475 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386885475 -0800

am 2609640e: Merge "Add an explicit definition of __ANDROID__=1"

* commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc':
  Add an explicit definition of __ANDROID__=1