| commit | 2ee825f507bec9c01667787ce11ddb5d8786d863 | [log] [tgz] |
|---|---|---|
| author | Diego Perez <diegoperez@google.com> | Wed Dec 02 00:04:08 2015 +0000 |
| committer | Diego Perez <diegoperez@google.com> | Wed Dec 02 00:04:08 2015 +0000 |
| tree | 218cbe57259aeba72b02f90dce816a6a7e1196b3 | |
| parent | d76acc80932f954ebda58b18e9639410fa4e27d2 [diff] | |
| parent | 956cad887014fae52d10f5371856173088b4ad30 [diff] |
resolve merge conflicts of 956cad8870 to master. Change-Id: Iebad149b2768bcd7a52ee2c7c8c260a9279d1742