| commit | 5c7daaf7763f4c1fc3eb44430d1b2e5bf11130e1 | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Tue Jan 27 16:24:32 2015 -0800 |
| committer | Jeff Davidson <jpd@google.com> | Tue Jan 27 16:24:32 2015 -0800 |
| tree | f0a61955dac8044d003f066ca4efee5ea09d3c04 | |
| parent | b032cd1f52835134e142b19f73648442237cd0d1 [diff] | |
| parent | b9470f3a238d67eb3a84ec5325d35757f298d644 [diff] |
resolved conflicts for merge of b9470f3a to master Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad