| commit | 7ed02dc7bddc2e9c89f768a63e79b1043d900323 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 16 13:10:32 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Jun 16 13:10:32 2014 -0700 |
| tree | 53265f24e27de04abd2e3ea0739c116b3304db72 | |
| parent | ef55368439837cc55e4706c670b150a1e1951ac7 [diff] | |
| parent | bb8886eb2038328475d5f9a4e11e3a13006ff091 [diff] |
resolved conflicts for merge of bb8886eb to master Change-Id: I6a0dec6ffc4b32d5db60aba5ed412238e85290d9