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