| commit | 100f99d625909fd17a722a0ed0148549afd55cf8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Apr 13 11:49:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 13 11:49:19 2011 -0700 |
| tree | 8ff46ca94161328683722aad9718dab20487a1f2 | |
| parent | 144058df70ad9a13f3897d3734f55a1517b9d7f7 [diff] | |
| parent | 28fc4830fdc68db134783955cc9f54f32d35b0fd [diff] |
am 28fc4830: Merge "Cleanup leftover merge conflict" * commit '28fc4830fdc68db134783955cc9f54f32d35b0fd': Cleanup leftover merge conflict