| commit | 8f2498715a3164869578e505475495525ee55b28 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Apr 13 12:02:16 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 13 12:02:16 2011 -0700 |
| tree | 9f92affced6cacd9a25f297bcac362f7961b3906 | |
| parent | 4462cee10216f3247637fba1fb9c0dd89941803f [diff] | |
| parent | 0255261244c020a651cf08edee541d4118e7f84d [diff] |
am 02552612: (-s ours) Merge "resolve a bad merge" * commit '0255261244c020a651cf08edee541d4118e7f84d': resolve a bad merge