| commit | e4041746d32aab20426601951f1846c3843474de | [log] [tgz] |
|---|---|---|
| author | Andrew Hsieh <andrewhsieh@google.com> | Mon Nov 12 13:38:21 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 12 13:38:21 2012 -0800 |
| tree | a45dfba4498d8b92f5149387d4f9d5296c23c3a6 | |
| parent | 81c5c8b8864d32adc74a56482125b46ed083d155 [diff] | |
| parent | abfb25226aabdbda7f8900e923754beb7f8cb94d [diff] |
am abfb2522: resolved conflicts for merge of 8b3ce5a3 to stage-aosp-master * commit 'abfb25226aabdbda7f8900e923754beb7f8cb94d': Use prebuilt gcc for MacOSX