| commit | 4b0ee78bfa0df6e278c7327822fd9a0eff52b584 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Apr 18 16:07:41 2014 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Apr 18 16:07:41 2014 -0700 |
| tree | 536b4b814feb42123a516c3eda279470f70bbcd3 | |
| parent | 5b5def547201b213bc2325400371c37d1612732e [diff] | |
| parent | 56ca82191231f3aba1132e3db06e7e09a10ec6dc [diff] |
resolved conflicts for merge of 56ca8219 to master Change-Id: I62f5804a5c4404eedce09188cda2e3b1bb990b36