| commit | 7b043b928233af644af05c927ee8bc019a8492e7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 09 15:36:49 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Tue Dec 09 15:36:49 2014 -0800 |
| tree | 3710a3e1d0c3b6fcb38736ed770ea961a51136e1 | |
| parent | f84c6a1fcd9b142b84af20ca2c6591de180ffe33 [diff] | |
| parent | 78b98d8807369fb440251396f6b8b22fe87a6e0a [diff] |
resolved conflicts for merge of 78b98d88 to master Change-Id: I1a132a85e270671eb9494957d3a6fab9dc928dd8