| commit | 4674fae60573cf2ac43c4a3f8388853a3172510c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Feb 11 20:38:23 2015 -0800 |
| committer | Elliott Hughes <enh@google.com> | Wed Feb 11 20:38:23 2015 -0800 |
| tree | c3ce26fef8c6bc00265c7762da7ffb342a4e0007 | |
| parent | 564f2305c6b7481433c2a06978625b38fb0a1ed2 [diff] | |
| parent | 64b816bafcb735dd06f4ddf233ba2bad8fd08f47 [diff] |
resolved conflicts for merge of 64b816ba to master Change-Id: Ie6348e38e90e48ffe115e63e5fde16640e2c3d92