| commit | 088c514cb13f3b8f8683588c2f398f18df1547c9 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Thu Nov 06 13:04:49 2014 -0800 |
| committer | John Reck <jreck@google.com> | Thu Nov 06 13:04:49 2014 -0800 |
| tree | 798905e133994e16fc1b66a8e6aedeab0eb98872 | |
| parent | 1af72bff509bb2638c2d7a1309dbf3f03736e6fd [diff] | |
| parent | be70c7713df98d81e9e43af9e76e0e6d018a4339 [diff] |
resolved conflicts for merge of be70c771 to master Change-Id: I469905bef7361c18aab725778694567d1987c06d