| commit | ae62b7b0bca9c46dea30ee81a7aada3e7576638b | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Tue Jun 07 16:24:15 2011 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Tue Jun 07 16:24:15 2011 -0700 |
| tree | 39c9ecb6b23bbee1a9d5f688444fb235dab7e61f | |
| parent | 67f09cd090adae6365ca36546b0a517e51255876 [diff] | |
| parent | 66040bbb087b04c4bbac8429f91bbff1029e1440 [diff] |
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a