| commit | de955b596348ee9fecb3a0f4f5934ca93c2e6d47 | [log] [tgz] |
|---|---|---|
| author | Evan Charlton <evanc@google.com> | Wed Mar 19 20:29:26 2014 -0700 |
| committer | Evan Charlton <evanc@google.com> | Wed Mar 19 20:29:26 2014 -0700 |
| tree | db55620136b7b90adc3422358b1acbe28ad2ade0 | |
| parent | 2e1350ea26f2b524ebfdae767f466212e39abfb9 [diff] | |
| parent | c592f7bdb27a0ed8fdd43a1dc0087f13c334bbc8 [diff] |
resolved conflicts for merge of c592f7bd to master-nova Change-Id: I5a17a53b0a251f6ca008dd50b1851b52721bd88e