| commit | 13d71d332cbfe9f91f5b91d105f594c07c94ef26 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Aug 23 12:28:20 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 23 12:28:20 2012 -0700 |
| tree | f2a238f6f5619fa4fc13473b3a32087df478a940 | |
| parent | 63325c910906c2b00d5eb1ebbce538dfe61c4b10 [diff] | |
| parent | 2bf953a9ba1949815f5022ae831e81061cb5c7e5 [diff] |
am 2bf953a9: Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev * commit '2bf953a9ba1949815f5022ae831e81061cb5c7e5': libcorkscrew: avoid future name collisions.