| commit | bd01583d6e936e93141d6b77aec9d8c99684d7a4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:22:58 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Jul 26 10:22:58 2010 -0700 |
| tree | 43634b475260f7f7ba3f89d99d3f87b9d5ba75c7 | |
| parent | 14d9c34ccb75795d0b219b3dcc42c2269eb0e756 [diff] | |
| parent | b237bdb647118329856f08da03505fbcd39d258b [diff] |
resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76