| commit | 73f37ed8269aeb7e3f17b2a4aca8ecee788efae7 | [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 | c595e40f5bf8f9ccb37a218da61140896337d1da | |
| parent | 47664252d9b78df69cc6dc3fb9c4d969290cc895 [diff] | |
| parent | 55fb51aa411b574646cc3068ce36e73789b81616 [diff] |
am 55fb51aa: resolved conflicts for merge of 86303198 to kraken