| commit | 716f60ce605131429dc9efe8f351f0da0c8cc8c2 | [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 | 3df7d23d035fa5fa3fbbb3ca95e3221cd43ee613 | |
| parent | 7b76ed693e42caea0c5f1bcbe7059c580e9cb314 [diff] | |
| parent | e2ec61b23b6da2f6f0796939c3e00aa77bf17569 [diff] |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf