| commit | 9bc20fb9de84effe8e88ccf9d526beafcea92ee9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 14:36:52 2012 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 10 14:42:21 2012 -0700 |
| tree | b07d719567df891c0028bf899982f624a8022dd5 | |
| parent | b654c68a4d86a74e9751ba6d7007e56803e7c63d [diff] | |
| parent | 3646b1085f422e5c7967af2c2ba30b76d80fa14f [diff] |
resolved conflicts for merge of 3646b108 to jb-mr1-dev Change-Id: I2ca60f4e861128143bbfe7eb688b255432423a9d