| commit | 77239a181641dd9a182246a48920f30a5f3056c5 | [log] [tgz] |
|---|---|---|
| author | Prashant Malani <pmalani@google.com> | Wed Feb 03 15:57:24 2016 -0800 |
| committer | Prashant Malani <pmalani@google.com> | Wed Feb 03 15:57:24 2016 -0800 |
| tree | 028f50881aea989606fa81f515fa28e8c6d5035e | |
| parent | 665586e341eb1643b1e17cd8027fa16b6395f0da [diff] | |
| parent | 14231e3c5752b60075d57f6b16ecadd34b86830e [diff] |
resolve merge conflicts of 14231e3c57 to master. Change-Id: I5333f649b7d3f3142846c33be55d6e4735a090d1