| commit | 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 16:21:31 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 16:21:31 2010 -0800 |
| tree | ef4b95d5a0084d141be9865de1ef0b1f1d3b5e07 | |
| parent | a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd [diff] | |
| parent | 6ed70d2d41f9929d1c3f5179d947766495f9efe5 [diff] |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf