| commit | 6c8de1b1beff59c47c67774d947b2a8b47384573 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 13:53:17 2014 -0800 |
| committer | Elliott Hughes <enh@google.com> | Wed Dec 10 13:53:17 2014 -0800 |
| tree | 54ea59af34742bfe2a0916fa3e2ed6d0665915af | |
| parent | 92e48de783a805d81a6584b2664304fb71eec2d4 [diff] | |
| parent | 4110da7522f25332fb0d2444932cb7c75112a7a3 [diff] |
resolved conflicts for merge of c162dbb2 to master Change-Id: If7ffc80560a807cb8e4338d42bec454f567fd9ad