| commit | 92dd82a6e283eab452ad020a602a878f64aa8894 | [log] [tgz] |
|---|---|---|
| author | Ben Cheng <bccheng@google.com> | Thu Dec 12 22:06:59 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 22:06:59 2013 +0000 |
| tree | 578914fd3482b72565841e1b03aa65910c97054f | |
| parent | 617253bb2275591cb325196eb6b8bc20de367a29 [diff] | |
| parent | 462b1ca7f6268282f147961aa03ca2433d59af17 [diff] |
am 462b1ca7: am 74f27cff: am af3d1408: am 2609640e: Merge "Add an explicit definition of __ANDROID__=1" * commit '462b1ca7f6268282f147961aa03ca2433d59af17': Add an explicit definition of __ANDROID__=1