commit | af3d1408be4acc8dd6ab0a34d5413c8996f7fa5f | [log] [tgz] |
---|---|---|
author | Ben Cheng <bccheng@google.com> | Thu Dec 12 13:57:55 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 13:57:55 2013 -0800 |
tree | eaab9e84c98ac6083253924c942979c84b57a1c3 | |
parent | 4d7448291158257d2a74b0fec3c4dd279fb85618 [diff] | |
parent | 2609640eaea1ba89a493cff2847cb9ec993dc9fc [diff] |
am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" * commit '2609640eaea1ba89a493cff2847cb9ec993dc9fc': Add an explicit definition of __ANDROID__=1