| commit | 843ff92bb0f2ff259145fd90333b0a50d8bbf342 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 20 18:16:57 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Oct 20 18:16:57 2010 -0700 |
| tree | d87cdb4903073358a76ee7b17d3584b2a38417f7 | |
| parent | 674b856c15206a23d9d8a22fbd936a4f3055894d [diff] | |
| parent | 5d919b4387488d2420cb14b4f9ba3fd158efa3cc [diff] |
resolved conflicts for merge of 5d919b43 to gingerbread-plus-aosp Change-Id: I8b8a8dfdd99052f3d43a0feb47168876b41e336d