| commit | 58003afdf38fa8234edf6e2c3d5a4ae54a958dcc | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Feb 02 14:33:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 02 14:33:15 2012 -0800 |
| tree | b78633fd54ee27cb2126a154df463c29439663a9 | |
| parent | 160dc0f298c870c701e663491c01ba8ed6bc7c4b [diff] | |
| parent | 6fa18274e5435ba29e9bb3df812fbe980620895c [diff] |
am 6fa18274: am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp * commit '6fa18274e5435ba29e9bb3df812fbe980620895c':