| commit | 7fd6b0b723bd37188af242ae71b5f02778bca529 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Apr 26 18:01:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 26 18:01:42 2010 -0700 |
| tree | 2316615a836500c1e7b629b83cdef86f5ee3cc23 | |
| parent | 65599b735bab558175d91c5c013954adce5665de [diff] | |
| parent | c4e2c6ecdbcad900db455af827a0781bf02d96e1 [diff] |
am 55fb51aa: resolved conflicts for merge of 86303198 to kraken