| commit | ac9ae4fd0a4ff040fd9cc0c62691be2ef927c1a4 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 14 15:26:35 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 14 15:26:35 2012 -0700 |
| tree | c32f357ed7429d222fa59f16c7f0513b1524d9f1 | |
| parent | c2bb1a78a19688f40b80176c1667289ebbfbd418 [diff] | |
| parent | 0560bd141a709741dc48edc117ab4675347118b2 [diff] |
resolved conflicts for merge of cf6f99e7 to jb-dev-plus-aosp Change-Id: I4d8d85960b5f0289ee442278db39b8f8c445d73e