| commit | e0380d8fe675a1c1785cfd5d2b7f0c6b59c27c54 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Wed Jul 17 18:44:03 2013 -0700 |
| committer | Dirk Dougherty <ddougherty@google.com> | Wed Jul 17 18:44:03 2013 -0700 |
| tree | 330964d2304e782aabcebe5bab56bcc0e6b6a17b | |
| parent | e874bd351f7b68cead889f55afba505fb5fac97c [diff] | |
| parent | 54201120705064fb62f7b31aa20c66c7ea681519 [diff] |
resolved conflics for merge of 54201120 to jb-mr2-dev Change-Id: If1675be05e403c33b320608333cb28ce2d9b68aa