| commit | 09f1e2b2151ea18c05b9138a0a5cb63af18ea373 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 09:53:43 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Sep 10 09:53:43 2010 -0700 |
| tree | a8867b197b5f31b9fc3d59dc724ffc9f1e43f3b3 | |
| parent | 94db0238a3b6cba3cbf0e037af74e898a4741204 [diff] | |
| parent | 56aa3c761d4e8c618151e92135706838abd84a6c [diff] |
resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617