| commit | 6ffee9bbba53700d33456261b986ac8a3f333b9e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Sep 08 11:03:22 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 08 11:03:22 2010 -0700 |
| tree | ff0cbc95771dc7b1a246978d9887fc23ae303896 | |
| parent | c4f628a1ba359926cf53ed7652d9abba6ea29123 [diff] | |
| parent | 2cc595af6542ba898ce3aa79daeee923b1a585fa [diff] |
Merge "Revert "resolve conflicts"" into gingerbread-plus-aosp