| commit | 462b1ca7f6268282f147961aa03ca2433d59af17 | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Thu Dec 12 22:03:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 22:03:40 2013 +0000 |
| tree | a93fa3d9b41bfaedf08e56bd1e26a4e835b0d040 | |
| parent | b6559177b3105e84dde449f8c5c4db519a047552 [diff] | |
| parent | 74f27cffd9bbbd0f791e1f0f0096f706c91ad08f [diff] |
am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" * commit '74f27cffd9bbbd0f791e1f0f0096f706c91ad08f': Add an explicit definition of __ANDROID__=1