| commit | 0cb17a52ee278e6fd1575a086dac155e11574287 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Mon Jun 06 15:33:37 2011 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Mon Jun 06 15:33:37 2011 -0700 |
| tree | bf5ab5f8a3309be1acca4ad67a460a13a5d5e40e | |
| parent | 8e97372913c9236ffdee175c6da99dc00c22b3e1 [diff] | |
| parent | ab79ee4adcbc6eb9fb9c509766753f65d3857739 [diff] |
resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp Change-Id: Ib885176060f65ef3286a24c7b9cae1a673666275