| commit | 65140fc2fca019dc3602134a4bc2b579178b52e0 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Mar 14 10:53:48 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 10:53:48 2011 -0700 |
| tree | f987f8ace90b720c52dd13e4979a1e18934b53c9 | |
| parent | b2c8dbeafb93d87ce877529c508c1911d6a9fcf6 [diff] | |
| parent | ff3d4bc42b22093695896bc319c59b139aa2c6f6 [diff] |
am ff3d4bc4: resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp * commit 'ff3d4bc42b22093695896bc319c59b139aa2c6f6': Disable ccache when use mingw.