| commit | dbb539695907b1a71dc09f3fc44c264d2c5745c6 | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Fri Dec 28 09:48:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 28 09:48:32 2012 -0800 |
| tree | 32ad79e8a6ec0858b17badc9846b8e801511e469 | |
| parent | cf3b931563fe097593027bffcf1593673fd0b9c1 [diff] | |
| parent | 1a65be974ca1b908969c798923d3a19e7c8ce801 [diff] |
am 1a65be97: Merge "Use __ANDROID__ to test for Android platform" * commit '1a65be974ca1b908969c798923d3a19e7c8ce801': Use __ANDROID__ to test for Android platform