| commit | fbc504d6a8ec1204b5fa203924f8324ff4aa0e74 | [log] [tgz] |
|---|---|---|
| author | Gloria Wang <gwang@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Oct 07 15:27:17 2010 -0700 |
| tree | c4e6adc37469742e2288bbf902b3059cb926c48a | |
| parent | da91f0b87bded1e4ebc9cc1a1712c7a0d44fba84 [diff] | |
| parent | 2272ee27d9022d173b6eab45c409b3c3f57f30ec [diff] |
resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76