| commit | cfea9fbc5320eac378c980787919eaae43ac72ae | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Jan 06 11:50:08 2015 -0800 |
| committer | Nick Kralevich <nnk@google.com> | Tue Jan 06 11:50:08 2015 -0800 |
| tree | 3ec6a63a7f596f4f35adcdf630af47bbfcaf2d74 | |
| parent | 17197b856b8485c02c9f55d2c57d070e6669abe0 [diff] | |
| parent | 175ef8121bf0972b177cc6cd0de87bbbc7946ca5 [diff] |
resolved conflicts for merge of 175ef812 to master Change-Id: I2c6f407fa56b13c54571f8a51573a4b45d251dbb